Logo und 100 pro aller
Merge branch 'master' of https://github.com/adc14/le_glitch

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