changed urls.py as I start to make the user login pages and views
Merge branch 'master' of https://github.com/josieh/playground-finder
User Login works
Merge branch 'newAlex2'

Conflicts:
	playgroundFinder/urls.py