new stuff with wizard
yep, all settled(merge)
Merge branch 'master' of https://github.com/edenzik/128Project

Conflicts:
	wizard/src/main/java/com/wrangler/app/Wizard.java
settled commit