ignore assets/dist due to mergeconflicts
Merge branch 'master' of https://github.com/adc14/le_glitch

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