cke
locked icon
Merge branch 'master' of https://github.com/TylerSandman/qhack
locked icon
Conflicts:
	img/locked.png