Commitwq
Merge branch 'front-end' of github.com:tarnfeld/cosmic-hack into front-end

Conflicts:
	front-end/js/app/main.js
	front-end/js/config.js