Commit with taking out database files
Finished all commits
Merge https://github.ncsu.edu/njclimer/expertiza into rails4

Conflicts:
	app/controllers/student_teams_controller.rb
	config/routes.rb
Changes from code review