Resolving merge - commiting local changes
Merge branch 'master' of https://github.com/sreadnovic/EDiary