remove the mistakes of carlos
fixed main ui
Merge branch 'addingnewblocks'
Merge branch 'master' of https://github.com/cortega2/MJBakingQuest
Merge branch 'master' into FixingParser