Adding drawing functions for circle, rectangle, line
Merge branch 'master' of https://github.com/michaelteckcahting/csc309-a1

Conflicts:
	js/main.js