add ship
Merge branch 'master' of https://github.com/KentaKomai/ActionscriptAnimation

Conflicts:
	.actionScriptProperties