master
ew
Merge branch 'master' of https://github.com/virtual97/kp

Conflicts:
	index.php