Did things?
Copied in the angular-seed-play files
Merge branch 'test'
Got angularjs working
Merge branch 'new_branch_name'

Conflicts:
	eve-industry-tracker/conf/routes
	eve-industry-tracker/project/Build.scala
	eve-industry-tracker/public/css/app.css
	eve-industry-tracker/public/js/app.js
Merge branch 'master' of github.com:cl05tomp/eve-industry-tracker