commit
Revert "import app"

This reverts commit 0e99c19fabde14c68ccb0ec7b9448fb8db944522.

Conflicts:
	public/javascripts/app.js
clean project start - working
commit - working
commit - working