initial commit
Merge branch 'master' of https://github.com/jsntsay/shinema

Conflicts:
	.gitignore