whatever i did on layouts/application
Merge branch 'master' of https://github.com/nojoek/lets530

merging bondy's and nate's and brad's updates