ignored database.php
Merge branch 'master' of https://github.com/realneo/hsc

Conflicts:
	.gitignore