adding *~ file to .gitignore
Merge branch 'Bootstrap' of https://github.com/eduncan26/socialNewsSite into Bootstrap