Yay removal
Merge branch 'master' of https://github.com/onethathasnolife/IST311Match3