fixed major crash in trading
trades up and running, trade log display needed
Merge branch 'master' of https://github.com/islingrad/factions into food
built food function, still needs integration with turn, going to clean up turn function next