all my work
Merge remote-tracking branch 'origin/master'

Conflicts resolved:
	app/routes.php
	app/views/diary.blade.php
	app/views/diarySingle.blade.php
	js/pages/diary.js
	js/pages/home.js