just testing
Merge branch 'master' of https://github.com/rigorojas/amazingCMS

Conflicts:
	www/index.php