style tweak and swipe
merge
swiping friends
fixed merge conflict
removing platforms from git repo
finished merging files