Commit before pulling max's excercide bug
Merge branch 'master' of http://github.com/zirbem07/alpha into sean