masse masse endringer
Merge branch 'master' of https://github.com/SimenHjelden/PrototypeEnigma

Conflicts:
	assets/css/styles.css