latest changes
Merge branch 'master' of https://github.com/steveroettger/kurbi-new

Conflicts:
	appKurbi/.DS_Store
	appKurbi/app/views/daily_journal/home.php
	appKurbi/app/views/master_template.php
	appKurbi/css/journal.css
lastest changes
Merge branch 'master' of https://github.com/steveroettger/kurbi-new

Conflicts:
	appKurbi/.DS_Store
	appKurbi/css/journal.css