added column
Merge branch 'master' of github.com:tyoshii716/ohirugohan
added column
add api route
Merge branch 'master' of github.com:tyoshii716/ohirugohan

Conflicts:
	www/config/routing.php