Sync
Merge branch 'master' of https://github.com/amberr/piratekings

Conflicts:
	public/css/style.css