Sort
Merge branch 'master' of https://github.com/dirgni/CoffeeBreakApp.git

Conflicts:
	war/Coffeebreak2013vrl.html