+ attempting to connect to psql server
Merge branch 'master' of https://github.com/XenoPhage/cs320

Conflicts:
	IndependentProj/WeatherApp/WeatherApp/settings.py