test
aa
aaMerge branch 'master' of github.com:tiritchi/XCH2014

Conflicts:
	.htaccess