Merge pull request #5 from Brian-Boyd/master

added join migration and revised other migrations and models
made some changes to controllers and some views
Merge pull request #9 from Brian-Boyd/master

Newest request
updated form and edit render
added bio to form
updated db migrations
Merge pull request #10 from cjcoopersc/master

updated form and edit render
controller, model, views and a little migration work
changes
some changes
testing
test 1129
lets hope this works
Merge pull request #12 from kevincol54/master

hopefully these changes work
controllers, models, views and migrations should all be working with the exception of the show view for students
Merge pull request #13 from kevincol54/master

controllers, models, views and migrations should all be working with the...
this should be the final working version
Merge pull request #14 from kevincol54/master

Code looks good to me.