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

pullin the latest goodies
charity search kinda working
fix merge conflict
Merge pull request #38 from joemeers82/master

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

and yet another pull
fix merge conflicts
fix some small errors
fix create challenge bug
Merge pull request #39 from marklc44/master

fix create challenge bug
this aint good
merge conflicts
pre-pull
fixed conflicts
new challenge form with charity ajax
add charity to challenge show page
added text controller
just checking
just checking
getting twilio up
Merge pull request #40 from marklc44/master

new challenge form with charity ajax