sdiddy/sdiddy — pull request #4 by sdiddy (2012-08-06 00:16:56+00:00)
Title: gitignore bug 2 fix

yes. you can merge