facebook user sign out and sign in working
too many views keep blowing up at me
clearing merge conflict
Merge pull request #17 from trinityXmontoya/testing

Tuesday 4/29 clean copy 9:20am resolved merge conflicts