Merge pull request #2 from empowerchris/Ryans

Ryans
Adding changes to my branch
models and validations
Merge branch 'master' into eldon
removed my view changes
Merge pull request #3 from empowerchris/eldon

Eldon
added nav_bar but breaking index
Updated all views.
Revert "removed my view changes"

This reverts commit 9f19cc275ca7672c6d871abb6dd367936b975d81.
deleted log file
removed excess code
Merge pull request #4 from empowerchris/eldon

Eldon
Removed conflicts
Resolved last conflict.  Trying to merge with master.
Merge branch 'master' into Ryans
Merge pull request #5 from empowerchris/chris

Chris
trying to merge with master
All CRUD now updated and working properly.
Merge pull request #6 from empowerchris/chris

All CRUD now updated and working properly.
fixed _form