Merge branch 'master' of https://github.com/pepko/cofeecups

Conflicts:
	cofeecups/templates/main.html
ticket:1 ready first point test task
ticket:1 ready first point test task