V1 complete
Merge branch 'master' of https://github.com/cp453/flummoxed