I did a lot of stuff today
Merge branch 'master' of https://github.com/nojoek/lets530

merge what nate did