Merge branch 'master' of
https://github.com/JohnBarton27/Tangible-Scheduler.git
Merge branch 'master' of https://github.com/JohnBarton27/Tangible-Scheduler.git
Merge branch 'master' of https://github.com/JohnBarton27/Tangible-Scheduler.git
Added protractor tests