added a new form
Merge branch 'master' of github.com:jconnor0426/gradetracker
Finished editing the subactivities
Merge branch 'master' of github.com:jconnor0426/gradetracker