Initial commit.
Merge branch 'master' of https://github.com/rysiekblah/crom

Conflicts:
	.gitignore