Added my changes
Merge branch 'master' of https://github.com/wdi-sf-september-2014-hw/git_intro