changes
Merge branch 'master' of github.com:portlandcodeschool/js-night-summer-2014