Exercise 1 of LearningPythonTheHardWay
Merge branch 'master' of https://github.com/tjcertified/pythonlearning

Trying to merge