Changed gemfile to get it to work
Removed commented out code
Merge remote-tracking branch 'origin/addhelpers' into rails4
Refactored by Renaming StudentTeamsController

Refactored entire program by changing all instances of
student_team_controller to student_teams_controller.
Began refactoring leave function, renamed to remove_participant
fomatted query styles
Merged with main branch
Final cleanups
Merged with Kevins Branch
first commit by navid, style change to controller only
first changes by navid
merge with remote
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
Refactored first 45 lines of code and added set_team
Merge https://github.com/IdeaHat/expertiza into rails4
refactored student_team_controller.rb
Reverted seed and other changed files