Initial commit
Merge branch 'master' of https://github.com/leatherbrain/CaptainAhab

Conflicts:
	Makefile