Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Prepping for another merge
Merge remote-tracking branch 'upstream/master'

Conflicts:
	js/widgrid.js
Stashed changes
Basic geometry implementation
Merge remote-tracking branch 'upstream/master'
Merge pull request #3 from TheGamersCave/master

Geometry basis