Updated small error in buttertest
Merge branch 'master' of github.com:tobyndax/TSDT14
Study 3 mostly finished