added log
Merge branch 'master' of https://github.com/NimaVaziri/PennApps

Conflicts:
	manyroutes/app/__init__.pyc
	manyroutes/app/views.pyc
	manyroutes/settings.pyc
	manyroutes/urls.pyc
	manyroutes/wsgi.pyc