users
Merge branch 'master' of github.com:m-antis/msb into users

Conflicts:
	db/schema.rb
Initial commit
users and sessions
Merged with users