ZOMG THE UI IS SOOOOO PRETTYYYY
Merge branch 'master' of https://github.com/pamo/CoffeeQuickly

Conflicts:
	app/views/home/index.html.erb