Use the other ship model.
Merge branch 'master' of github.com:darabos/pyweek-nemesis

Conflicts:
	ships.py
Merge branch 'master' of github.com:darabos/pyweek-nemesis