Finished Diary app
Merge branch 'master' of https://github.com/JediMindTricks/Diary