Merge pull request #12 from ccravens/master

changed to get
Merge branch 'master' of https://github.com/kennyfuqua/web102
Merge pull request #13 from kennyfuqua/master

pull