merge conflict
Friendships in progress
merging onto development
Merge branch 'master' into development
Added about page, formatted arrows
Fixed merge conflict
last touches on About Us page