Button Reformatting
Merge branch 'master' of github.com:Eduki/eduki