Merge branch 'master' of C:\Users\Chase Johnston\Documents\GitHub\RCI with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Trying to add fb