linkedin file
Merge branch 'master' of https://github.com/mohamedkomalo/nyuad_hack

Conflicts:
	mysite/urls.py