Moar things!
Merge branch 'master' of github.com:PinionTech/rear-admiral

Conflicts:
	index.coffee.md