commit
Merge branch 'dev-hx' of github.com:CS305JSX/PaintProject305 into dev-hx