git ignore
Merge branch 'master' of https://github.com/JRJurman/nameless-headland-5159
fixed git ignore