Fixed .gitignore merge conflict and updated readme for no pushing
Updated README with ssh url
Merge pull request #5 from joshball/master

Fixing merge conflicts, and updating readme and gitignore