Removed assets from project
Merge branch 'master' of github.com:codespartans/play-template

Conflicts:
	app/assets/javascripts/controllers/testCtrl.js
	app/assets/javascripts/services/websocket.js