worked more on stuff
Merge branch 'master' of https://github.com/cortega2/MJBakingQuest
Merge branch 'master' of https://github.com/cortega2/MJBakingQuest
Merge branch 'master' of https://github.com/cortega2/MJBakingQuest

Conflicts:
	MJBakingQuest.pro.user
	draw.cpp
	draw.h
	main.cpp

more clean up