profile picture
Merge branch 'master' of https://github.com/kathyu8/linkedinHackday2013

Conflicts:
	app.py