ignore style.css add styling

Conflicts:
	assets/css/style.css
	assets/js/dist/main.min.js
same stuff again
gitignore assets folder
git cache cleared
Meine Nachricht
Meine Nachricht
Merge branch 'master' of https://github.com/adc14/le_glitch
merge master