add render
adding circles
got individual circles going
adding auctions
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/controllers/circle.js
	public/views/circle.html
	public/views/home.html