pulling changes from today's updates
Merge branch 'master' of https://github.com/afahim/warioware