RESET database and FIXED user.rb
Merge branch 'new'

Conflicts:
	app/models/user.rb
Merged to latest version
MERGING again
RESTORED *.lock files to .gitignore
DELETED <<<HEAD in index.html
CHANGED login/registration/password reset layout
IMPROVED name regex to allow multiple names, IMPROVED name input correction, ADDED user tests to verify them
FIXED legend text for registration/password reset e-mail forms
IMPROVED user name regexes and user rspecs (not working 100% yet)
CHANGED user name regex and rspec tests to allow (multiple) names containing ASCII letters and separated by one whitespace
Merge branch 'various' of github.com:alex-zelikow/grasshopper into alex-zelikow-various

RESOLVED conflicts in application.scss
Merge branch 'alex-zelikow-various'
ADDED back create_users migration file temp