add users
-true
Merge branch 'master' into users

Conflicts:
	spec/dummy/db/schema.rb
Merge pull request #9 from opahk/users

Users
Merge branch 'master' into gapfishify