added a line, atryino
update
added action_marker_logic
Merge branch 'master' of github.com:karrde00/trajan-online into atryino
comments in action marker logic file
add action marker logic file
Merge branch 'master' of github.com:karrde00/trajan-online into aadq67/sprint1-actionMarkerLogic

Conflicts:
	README.md
added seaport file and aml test file
added seaport class/functions
add functions
Merge branch 'master' of github.com:karrde00/trajan-online into aadq67/sprint2
modify aml and testing
modify files
.
Merge branch 'master' of github.com:karrde00/trajan-online into aadq67/sprint2
modify action and seaport
Merge branch 'master' of github.com:karrde00/trajan-online into aadq67/sprint2
Merge branch 'aadq67/sprint2' of https://github.com/karrde00/trajan-online into aadq67/sprint3
new comments
update