Added description
formatting
        Started using PHP to handle html pages
	Minor edits
Merge branch 'master' of https://github.com/lots0logs/Cara

No clue why git is tripping out, there is no commit
Merge branch 'master' of https://github.com/lots0logs/Cara

Conflicts:
	.htaccess
	php-version/calendar.php
	php-version/chart.php
	php-version/error.php
	php-version/file-manager.php
	php-version/form.php
	php-version/gallery.php
	php-version/grid.php
	php-version/icon.php
	php-version/index.php
	php-version/login.php
	php-version/table.php
	php-version/tour.php
	php-version/typography.php
	php-version/ui.php
	test/calendar.php
	test/chart.php
	test/error.php
	test/file-manager.php
	test/form.php
	test/gallery.php
	test/grid.php
	test/icon.php
	test/index.php.bak
	test/login.php
	test/table.php
	test/tour.php
	test/typography.php
	test/ui.php
	www/calendar.php
	www/chart.php
	www/error.php
	www/file-manager.php
	www/form.php
	www/gallery.php
	www/grid.php
	www/icon.php
	www/index.php.bak
	www/login.php
	www/table.php
	www/tour.php
	www/typography.php
	www/ui.php
	cleaning up mess