Merge pull request #3 from joshuamartin/dev

Dev
add .gitignore