updated gitignore
Merge branch 'master' of https://github.com/jenterkin/wcc

Conflicts:
	.gitignore
modified django project settings