cleaning up in jsp to jade files
Merge branch 'master' of https://github.com/jibhaine/gotloop into HEAD

Conflicts:
	app.js
flattening project structure