Fixed a few naming issues?
Added some basic call/text
Merge branch 'develop' of https://github.com/afilippi/Code-One-2014 into develop