more changes
Merge branch 'master' of github.com:miloszhygen/impact

Conflicts:
	app/scripts/controllers/main.js