receive_texts controller
removed send_texts controller
some fb login stuff
twilio working and facebook working plus some bootstrap navbar stuff
some rebase error fixing
Merge pull request #22 from MiriamNeubauer/master

lgtm