conflict
Merge branch 'master' of https://github.com/EpiM3/hackaton

Conflicts:
	app/scripts/controllers/main.js