maybe made some changes
Merge branch 'master' of https://github.com/albertcui/assassin

Conflicts:
	assassin.html
	assassin.js