Make a basic User model(with secure passwords)
Merge branch 'master' into modeling-users

Conflicts:
	Gemfile
	Gemfile.lock
	db/development.sqlite3
	log/development.log