Fixing merge error
Merge branch 'master' of https://github.com/osmihi/Capstone

Conflicts:
	public/index.php