Merge pull request #1 from LNA/quiz_2

finished quiz 2
Merge pull request #2 from LNA/quiz_3

finished quiz 3
added .gitignore
Merge pull request #3 from LNA/quiz_4

Quiz 4
changed .gitignore to include Vim
added DS_Store
first half of quiz 5 specs
merge master