this should fixes #3
Merge branch 'master' into kill_list

Conflicts:
	kill_list.md
Merge branch 'kill_list'