changed huestep
Merge branch 'master' of https://github.com/jwbowler/etaBasement

Conflicts:
	src/testApp.h
add obj/ to gitignore