Changed mysql connection from socket to tcp using localhost for *nix/windows inter-op
Mysql2 gem now required to be <= 0.3.11 due to windows inter-op (this may not be needed for all configurations)
Devise now requires a secret_key in its configuration (please change this on your machine)
Guard added
Edit team button moved to be outside of tab
Challenges removed from header
Merge branch 'master' of github.com:starkriedesel/ScoreEngine

Conflicts:
	Gemfile
	app/views/services/index.html.haml