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 pull request #24 from karrde00/crcxwc_sprint3

Crcxwc sprint3
Merge branch 'master' of https://github.com/karrde00/trajan-online into byw5k6/Sprint3-finishForumAction
changes made
name refactor
added movement functions to forumLogic.js
added userinput to movement
changes
Working senate action....mostly
Merge pull request #25 from karrde00/fhmqpd/sprint3-senateaction

Fhmqpd/sprint3 senateaction
merge conflicts
merge conflicts