Stuff
Merge branch 'master' of https://github.com/MaliceMaikel/coffeeAdmin

Conflicts:
	dev/coffee/main.coffee
	src/index.html