Updating gitignore
Merge branch 'develop'
Fixed repository from Andrew's tomclownery.