No index page
updated .gitignore?
Merge branch 'master' of https://github.com/cbaconneumont/bacon_chris_csc360