added timeLogic.php
added timelogic.php
added forumAction
Merge branch 'master' of https://github.com/karrde00/trajan-online into byw5k6/sprint2-forumAction
M
ls
rge branch 'master' of https://github.com/karrde00/trajan-online into byw5k6/sprint2-forumAction
moved forumAction to actions folder
Merge branch 'master' of https://github.com/karrde00/trajan-online into byw5k6/Sprint3-finishForumAction
changes made
added movement functions to forumLogic.js
added userinput to movement
changes
merge conflicts
Merge branch 'master' of https://github.com/karrde00/trajan-online into brtnrf/sprint3-MilitaryLogic
Updating Mil logic. Can move tokens to mil camp, and then to leader