completed exercise01
Merge branch 'master' of git://github.com/aliciafrench/RubyFall2013 into aliciafrench-master
Fix merge conflicts