made wheel work
merge
Merge branch 'master' of http://github.com/henrybond158/Smart-Programming-Project

Conflicts:
	wheel.py