push to get .gitignore working
Merge branch 'master' of https://github.com/lanmower/gong

Conflicts:
	protected/runtime/application.log