exx
Merge branch 'master' of https://github.com/ratulmukh/tashjik

Conflicts:
	TashjikCore/src/main/scala/tashjik/chord/NodeManager.scala
	TashjikSim/app/views/index.scala.html
	TashjikSim/public/javascripts/chordcircle.js