Added Friends to Parse
Merge branch 'master' of https://github.com/andrewluchen/StatusQuiz

Conflicts:
	templates/header.html