Working more on Trajan Action.
Cleaned up code.
Finished-ish trajan action.
Finished Trajan Action Logic
Added the new Forum and Ship Assets
Fixing conflict errors
Merge branch 'master' into jckv22/sprint4
Merge branch 'master' into jckv22/sprint4