migrations
migrationseeds
factory
firstpush
Merge branch 'feature/models' into develop
modelcorrection
Merge branch 'feature/jointable' into develop
messagestable
Merge branch 'feature/messagestable' into develop
controllers
Merge branch 'thursday536' into develop
Linked to Bootstrap cdn
Added bootstrap cdn
Merging
bugfix
Merge branch 'thursday8pm' into develop
protectedpassword
added name and password for database, wrote some unit tests
Merge branch 'develop' of github.com:kingllama/parent-teacher into testing
adding collaborator updates
created message test, repaired other tests, added migrations to repair student-school and teacher-classroom associations