Merge branch 'master' into feat-spaces

.gitignore

+*.acn
+*.acr
+*.alg
+*.aux
+*.bak
+*.bbl
+*.bcf
+*.blg
+*.db
+*.dvi
+*.glg
+*.glo
+*.gls
+*.idv
+*.idx
+*.ilg
+*.ind
+*.ist
+*.lof
+*.log
+*.lol
+*.lot
+*.nlg
+*.not
+*.ntn
+*.out
+*.pdf
+*.run.xml
+*.slg
+*.slo
+*.sls
+*.synctex
+*.synctex.gz
+*.tdo
+*.toc
+*.tps
+*.wrt
+*.xdv
+*.xdy
+!images/*
+!images/*.pdf
+!images/*/*.pdf
+!images/*/*/*.pdf
\ No newline at end of file