Ability to click enter to login
Merge branch 'master' of https://github.com/travisreed-wf/494Sandbox

Conflicts:
	src/auth/views.py
commented permissions column. enter button to register
added a permissions and display name column in data base. Register added display name and validation
Merge branch 'master' of https://github.com/travisreed-wf/494Sandbox

Also changed models
changed my display names to travis's name. Hit enter to validate not to submit.
Update views.py
Update models.py
Update readme

- Add deployment instructions
- Update resource links
Readme spacing
Undo commit
Updated Display Name regsx and hide buttons on login and registration pages
Merge branch 'master' of https://github.com/travisreed-wf/494Sandbox
Merge branch 'master' of https://github.com/AJH693/494Sandbox

Conflicts:
	src/auth/views.py
Merge pull request #23 from travisreed-wf/master

add login required decorator
Merge branch 'master' of https://github.com/travisreed-wf/494Sandbox
change local settings to work
fixing things that were lost in merge
merge stuff lost in merge
Merge pull request #21 from AJH693/master

Database Changes: Name and Permissions