infinite loop handled
Merge branch 'master' of https://github.com/OpenDSA/OpenDSA-server

Conflicts:
	ODSA-django/openpop/try.sh
put back settings.py
dont commit settings file
test