Added some tests for controllers
Merge branch 'master' of https://github.com/CSc436/gymjournals
Remove commented-out line
Merge branch 'master' of https://github.com/CSc436/gymjournals
Add nvd3.js to bower and karma configuration
Fixed merge conflicts
Load jQuery first in karma
Merge branch 'master' into 85JSTestController

Conflicts:
	site/app/bower.json
	site/app/js/app.js
	site/app/js/controllers.js
Fix conflict
Merge pull request #96 from CSc436/85JSTestController

Added some tests for controllers