qsdqsd
Merge branch 'master' of https://github.com/tiritchi/XCH2014

Conflicts:
	include/index.php