changes indentation in modules/users/main.php
adds nbproject dir to .gitignore
Merge branch 'master' of https://github.com/DracoWhitefire/CTM

Conflicts:
	.gitignore