worked on profile page, add friend from profile
Merge branch 'master' of https://github.com/amstone326/PennBook

Conflicts:
	views/home_layout.ejs
	views/profile.ejs