some stuff
Merge branch 'master' of github.com:supermacaw/hackhealth

Conflicts:
	venv/lib/python2.7/site-packages/psycopg2-2.5.1-py2.7.egg-info/PKG-INFO
	venv/lib/python2.7/site-packages/psycopg2-2.5.1-py2.7.egg-info/installed-files.txt
	venv/lib/python2.7/site-packages/psycopg2/__init__.pyc
	venv/lib/python2.7/site-packages/psycopg2/_json.pyc
	venv/lib/python2.7/site-packages/psycopg2/_psycopg.so
	venv/lib/python2.7/site-packages/psycopg2/_range.pyc
	venv/lib/python2.7/site-packages/psycopg2/errorcodes.pyc
	venv/lib/python2.7/site-packages/psycopg2/extensions.pyc
	venv/lib/python2.7/site-packages/psycopg2/extras.pyc
	venv/lib/python2.7/site-packages/psycopg2/pool.pyc
	venv/lib/python2.7/site-packages/psycopg2/psycopg1.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/__init__.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/dbapi20.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/dbapi20_tpc.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_async.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_bugX000.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_bug_gc.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_cancel.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_connection.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_copy.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_cursor.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_dates.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_extras_dictcursor.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_green.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_lobject.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_module.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_notify.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_psycopg2_dbapi20.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_quote.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_transaction.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_types_basic.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_types_extras.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/test_with.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/testconfig.pyc
	venv/lib/python2.7/site-packages/psycopg2/tests/testutils.pyc
	venv/lib/python2.7/site-packages/psycopg2/tz.pyc