tyring to get the server stuff to work
adding stuff so that the shop can work, still making changes, not
finished yet
yup
Merge branch 'master' of https://github.com/pgerlich/conquestOnline