trying to link with Johanna's buttons
teacher
Merge branch 'Molly-feature'
merge conflict
Merge branch 'master' of https://github.com/rgschneider/group-project-base into johanna_feature
buttons
Merge pull request #16 from rgschneider/johanna_feature

teacher.html
adding mine to my feature before pulling jo's from master...
getting closer
textArea working better
Merge pull request #17 from rgschneider/jon-feature

Jon feature
newest version
Merge pull request #18 from rgschneider/Molly-feature

textArea working better...
more teach.html and fixed pep8 in views
buttons
question mark being a punk
added help object syntax in collapseThree
Merge pull request #19 from rgschneider/jon-feature

more teach.html and fixed pep8 in views
object creation
Merge branch 'master' of https://github.com/rgschneider/group-project-base