trying to get the shop to work
Making stuff so that the server can process the request right, adding
final touches to shop
yyup
Merge branch 'master' of https://github.com/pgerlich/conquestOnline
Merge branch 'master' of https://github.com/pgerlich/conquestOnline