Merge my Python basics exercise

@eah13 it looks good http://aogletree.github.io/spring2014/