Server update for kill
Merge branch 'master' of https://github.com/AlexxHansson/assassin

Conflicts:
	app/js/app.js