nimrod 3
Merge branch 'master' of https://github.com/neemandu/CT.git

Conflicts:
	newfile.php