Changes made by asd asd (anti_sto@abv.bg).
Merge branch 'master' of https://github.com/dokov/hackaton-team12.git
Changes made by asd asd (anti_sto@abv.bg).
Changes made by asd asd (anti_sto@abv.bg).
Changes made by asd asd (anti_sto@abv.bg).
Merge branch 'master' of https://github.com/dokov/hackaton-team12.git

Conflicts:
	HackatonApp/index.html
	HackatonApp/scripts/app/main.js