merged gitignore
Merge branch 'master' of github.com:cswanson310/ballin-octo-bear