commit to pull
resolve conflicts
added Task model
Merge branch 'master_test' of github.com:EricFridrich/Team2A into master_test
started writing junit test for task model
comments
Merge pull request #9 from EricFridrich/master

Merge pull request #8 from EricFridrich/master_test
Improved Unit Tests
working on bug with email updating
added task model
merging add_tasks into master_test
edited tests
added bootstrap based calender
Merge pull request #11 from EricFridrich/add_calender

added bootstrap based calender
Added junit tests for task model
added commitment model
changed file extension of events
use ajax to display tasks on calendar
adding moodle features
readying for heroku deployment