Created models and migrations, migrated to db
Changed User model to include reset token
added routes
Merge pull request #1 from dcgudeman/master

added routes
Merge branch 'master' of https://github.com/ikitha/Project_2

Conflicts:
	config/routes.rb