Added .gitignore
Merge branch 'master' into BHoward
Merge branch 'BHoward'
Merge branch 'master' of https://github.com/bharris057/potato