Updated to be stand alone
Merge branch 'master' of https://github.com/d4l3k/sketchy-url-shortener

Conflicts:
	project/plugins.sbt