Refactored squares, added buttons to play either animation
Merged