changed gitignore
Merge branch 'master' of github.com:kevinnivek/barefootdads

Conflicts:
	barefootdads/settings.py