First draft of app
Typo
Merge branch 'develop' into angular-app

Conflicts:
	app/assets/javascripts/application.js
ui-router
Merge branch 'develop' into angular-app
Got routing working. Kind of
Merge branch 'develop' into angular-app

Conflicts:
	app/assets/javascripts/ng/app.js
	app/views/home/index.html.haml
stuff