new design
Merge branch 'master' of github.com:sublee/zeronimo

Conflicts:
	zeronimo.py