ignore one file
Merge branch 'master' of github.com:0x01/hack4good-2014