firstCommit
second commit
third try
third try
Merge branch 'master' of https://github.com/ericgrove/time2

Conflicts:
	app/assets/javascripts/d3arc.js
changed d3arc