wercker deploy
Merge branch 'master' of heroku.com:spitball

Conflicts:
	README.md
	src/main/scala/services/Spitball.scala
	src/test/scala/SpitballCoreTests.scala