ensime project definition
indentation
Merge branch 'master' of github.com:jmcejuela/MitJustinBot

Conflicts:
	src/main/scala/ControlFunction.scala
Merge branch 'master' of github.com:jmcejuela/MitJustinBot