Git is telling me to commit I dont know why
Merge branch 'master' of http://github.com/LukeShu/leaguer

Conflicts:
	app/assets/stylesheets/scaffolds.css.scss
	app/views/games/index.html.erb
	db/migrate/20140304043618_create_servers.rb
	db/migrate/20140304043622_create_matches.rb
	db/migrate/20140304043631_create_games.rb
Merge branch 'master' of http://github.com/LukeShu/leaguer
Merge branch 'master' of http://github.com/LukeShu/leaguer
Merge branch 'master' of http://github.com/LukeShu/leaguer
Changed some username validation stuff
Merge branch 'master' of http://github.com/LukeShu/leaguer