Merge pull request #16 from aliciafrench/master

Added calendar
Merge pull request #17 from aliciafrench/master

removed default controller test for mycalendar
associate user with new goals
merge with Thomas' work