Updated to make it seem more randomized button-wise
Merge branch 'master' of https://github.com/elefse/JADITO