Fixed merge, began work on diary functionality
Merge branch 'master' of https://github.com/SEAHood/Team6IndustrialProject.git