Changed README.rst and .gitignore back
Fixed wsgi settings
Added gitattributes file for merging to production.  Do not make changes in production.  Do not merge production into master
Merge branch 'master' into production
Fixed merge issues
Security improvement
Merge branch 'master' of https://github.com/courseportal/coursePortal
Fixed typo in class index page.
Added a delete class option in the class editing page.
Models changed to get ready for migration.  Bug in admin fixed.
Reverted models back to its correct state for master.
Merge branch 'master' into production