working on friends page
done with friends
merge ignores
Merge branch 'master' of https://github.com/legarlin/KeepUp
friend stuff
merge fixes