This file accidentally got checked in
This update got lost in the big revert
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #56 from yaronyg/master

Deleting a .idea file that snuck in and a bug in a gitignore