Merge pull request #7 from rocketu/forms-branch

fixed registration form
Merge pull request #8 from rocketu/forms-branch

created pre-forms
Models and form changes
landing page commit
Merge branch 'layout' of github.com:rocketu/power-puff-girls into layout
Merge pull request #9 from rocketu/logic

Models and form changes
Revert "Models and form changes"
landing page
Merge pull request #10 from rocketu/layout

Layout
Forms added
Forms
Forms update
not sure
Merge pull request #13 from rocketu/logic

Logic
Merge pull request #12 from rocketu/revert-9-logic

Revert "Models and form changes"
created html pages for students, feed, and exercises
Testing merging models to develop
Merge branch 'models' into develop
Merge conflict
Added teach_app and git Merge conflict 2
Merge branch 'layout' into develop