Added in shape drawing code + made some aliases
Merge branch 'seven'

Conflicts:
	client/topdown.js
	public/topdown.min.js
	public/topdown.min.map