new gitignore
Merge branch 'master' of github.com:CherryMortar/Rampart