++
Merge branch 'master' of https://github.com/whoooah/server-restarter

Conflicts:
	.idea/workspace.xml
	project.clj
	src/server_restarter/handler.clj