friendlies
Merge branch 'mintyfresh' of https://github.com/cblop/hotandcheesy into mintyfresh

Conflicts:
	public/javascripts/Ship.js
	public/javascripts/main.js