Init
Merge branch 'master' of github.com:MattiasFestin/eventhashmap

Conflicts:
	.gitignore