Makaka-code eliminated
Merge branch 'master' of https://github.com/latticetower/au-fall-2013-Sanger