initial commit
Merge branch 'master' of github.com:whysthatso/heegel

Conflicts:
	.gitignore
Merge branch 'master' of github.com:whysthatso/heegel