Edited GitIgnore
Merge branch 'master'
Fixed project
Merge pull request #16 from palmerhyde/develop

Develop