add circle maker
get c5.json from ajax
merge boss'changes
Merge branch 'master' of github.com:island205/Vroom

Conflicts:
	scripts/user.js
	user.html
merge user2.html to user.html
Merge branch 'master' into gh-pages
sync with master