my first commit
Merge branch 'master' of https://github.com/mattphotonman/2014-03-17-nyu-exercises
Merge pull request #2 from emfuller/master

I'm making a pull request!