Changes made by Momchil Tzekoff (momchiltzekoff@gmail.com).
Merge branch 'master' of https://github.com/dokov/hackaton-team12.git

Conflicts:
	HackatonApp/styles/chillin.css
Merge branch 'master' of https://github.com/dokov/hackaton-team12.git
Changes made by Momchil Tzekoff (momchiltzekoff@gmail.com).
Merge branch 'master' of https://github.com/dokov/hackaton-team12.git

Conflicts:
	HackatonApp/scripts/app/main.js