Merge branch 'figaro' of https://github.com/adc14/le_glitch into figaro

Conflicts:
	.gitignore
	assets/js/dist/main.min.js