user auth
Merge remote-tracking branch 'upstream/master'
merging
Conflicts:
	pickoneside/db/migrate/20130305085819_create_wars.rb
	pickoneside/db/schema.rb