xamp 3
Merge branch 'master' of https://github.com/neroze/tree

Conflicts:
	index.php