init
Merge branch 'master' of https://github.com/Eventshop/EventShopAlpha

Conflicts:
	.gitignore
add file