Start of d3.js magic
( / need to deploy, so stash stuff away)
Merge branch 'master' into polina

Conflicts:
	app/templates/user.html
Merge branch 'master' into polina
Initial push of some serious d3.js orange magic
Merge pull request #1 from danrschlosser/polina

Polina