copied files from incorrect directory
Merge branch 'comms'
Merge branch 'master' of https://github.com/inventowiz/FriendTrack