Merge branch 'master' of https://github.com/mjminc/project2

pullin the latest goodies
Merge branch 'master' of https://github.com/mjminc/project2

and yet another pull
this aint good
merge conflicts
added text controller
getting twilio up
Merge branch 'master' of https://github.com/mjminc/project2

adding functionality
fixed merge issue
Merge pull request #41 from rasbabbo/master

added basic twilio