Cleaned up the asset folder.
Merge pull request #12 from kedromelon/Matt'sBranch

Cleaned up the asset folder.
removed ship.ma
Merge branch 'master' into noah_develop