Merge pull request #1 from calvintwr/calvin

gitignore
Merge branch 'calvin'

* calvin:
  ..
..
Merge branch 'master' into calvin

* master:
  ..
pastel colors