lol stuff
merged
build changes
Merge branch 'master' of https://github.com/rechsteiner/mina

Conflicts:
	build/index.html
	build/stylesheets/all.css