ck
Merge branch 'dev' of https://github.com/droganov/Coffee-Flow into dev

Conflicts:
	css/demo.css
	js/coffeeflow.js