Add validation (not working)
Merge branch 'api' of github.com:jaaaaared/battlehack-web into api

Conflicts:
	app/models/user.rb
Merge branch 'master' of github.com:jaaaaared/battlehack-web