Merge branch 'Kelly'
Merge branch 'master' of https://github.com/CSC420/Paintimator