Merge branch 'master' into achievements
achievement logic still needing work
Merge branch 'master' of github.com:ecasilla/Moolah