Murodese/pynab — pull request #39 by bettse (2014-02-10 04:37:19+00:00)
Title: Remove conflict lines from gitignore

Not that its very impactful, but I noticed the gitignore had conflict markers. I also added build/ and logs/ since I thought they'd be useful.