rm log
Merge branch 'master' of https://github.com/Ocro/turnt-ninja

Conflicts:
	logs/application.log