Ran bower update.
Needs to be deleted.
added button text and links for leaderboard on main page
changed leaderboardtablesctrl to use ngresrource instead of http for ajax
Fixed conflict.
Merge branch 'dev' into c1moore_branch
Added routes to check authorization and login status.
Factored out app-route declarations, removed dead code, removed extraneous console.log messages
added authentication checking to leaderboard page
Removed extra console.log
Reverted the login function and set a few additional fields to undefined if they are unneeded.
Factored out event app.route declarations into new file
Merge branch 'dev' into james_routes
Merge branch 'dev' of https://github.com/c1moore/cen3031project into dev
Removed extraneuos file
Merge branch 'dev' of github.com:c1moore/cen3031project into dev
Beginning work on database populator script
Moved file, we decided on making a proper populator script
Added a factory function in angular to check the roles for a user
Merge branch 'daltonbranch' into dev

Conflicts:
	public/modules/leaderboard/tests/leaderboard.client.controller.test.js