put it on my laptop
Merge branch 'master' of github.com:islingrad/factions
bug fixes, acceptance function needed for trades