Merge branch 'dev' of https://github.com/whizkid338/online_journal into dev
Merge branch 'dev' of https://github.com/whizkid338/online_journal into dev