Delete .gitignore (junyangs-MacBook-Pro's conflicted copy 2013-11-08)