Trying to get things to work on host...
Merge branch 'master' of https://github.com/okaapi/okaapi

Conflicts:
	app/controllers/diary_controller.rb
	app/controllers/okaapi_controller.rb