Added data to seeds file.
Added the files for friendships and some code
Added user profile page
Friend Requests
Merge branch 'development' of https://github.com/ericfrommelt/retreat_app into development
changed some user controller around
updated merge conflict
updated merge conflict in routes
Friendships
solved merge conflicts
tweaks to the friendship system
merge conflicts solved
merge conflicts solved some more