no message
Merge branch 'master' of https://github.com/yasutoshi0704/hackathon

Conflicts:
	fuel/app/logs/2014/05/11.php

remove log file