Merge branch 'master' into develop
splitting math functions into Math.java and organizing code
changing button init
rearranging functions
using getK more often
bumping version for code fixes
Merge branch 'develop'