Committing progress to date
Merge branch 'master' of github.com:JeremyRuhland/hackerboat