Makin' tests pass
Merge branch 'master' of https://github.com/8bitDesigner/OctoPie

Conflicts:
	lib/octopie.js