added some basics
Merge branch 'some_basics'

Conflicts:
	app/models/user.rb