Sample config
Sample config
Fixing my stupid git problems
Merge branch 'master' of github.com:bign8/NateCMS

Conflicts:
	.gitignore
	libinc/config_blank.php
more deletions