urls.py added
settings.pyc removed
Merge branch 'master' of https://github.com/codeocelot/PsiU_Site

Something