rename to avoid bower warning
added bootstrap js & jquery
display error message if bad login
start to pull apart user controller so we can someday make a model
Merge branch 'master' of github.com:stoltene2/yerba-buena-stories

Conflicts:
	ui/app/views/main.html