update index
.html
update index.html
added logo
added logo
updated merge conflicts
XMerge branch 'gh-pages' of https://github.com/ieee-carleton/spac-website into gh-pages