rm ng-cloak
Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into testing
ng-cloak
Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into testing
started board testing
Merge branch 'develop' of https://github.com/Agreemates/agreemates into merge-test
board testing
merge
merge
Merge branch 'testing' of https://github.com/worxli/AgreeMates into testing
fix json
fix json
merge
Merge branch 'develop' of https://github.com/Agreemates/agreemates into merge-test
 testing calandar
testing cal
added initial cal
added calendar
Merge branch 'develop' of https://github.com/AgreeMates/AgreeMates into testing
Merge branch 'develop' of https://github.com/Agreemates/agreemates into add-calendar