Commit to Sync
Merge branch 'master' of https://github.com/SE3353-HCI/SimpleSketch-3353

Conflicts:
	SimpleSketch-3353/Form1.Designer.cs
	SimpleSketch-3353/Form1.cs