setting up settings stuff
setting up git ignore
Merge branch 'master' of https://github.com/RyanPhillips10/3024u

Conflicts:
	.gitignore
	freeLawnBid/freeLawnBid/settings.py