template project
changes
Merge branch 'master' of https://github.com/CzechHackathon2014/jetlag-guru

Conflicts:
	README.md