Prelim login system
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/panjiw/Team-Player