Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/javascripts/script.js
merge
added rectangle and circle path
commiting testing code
Merge pull request #5 from deemz0/master

Circle, Rectangle, and Testing Code
Resolved merge conflicts (I hope...)