Initial commit
initial import
Merge branch 'master' of github.com:jempe/hockey

Conflicts:
	.gitignore