Update index.html
Update index.html
Update index.html
Update index.html
updating
Merge branch 'gh-pages' of github.com:cosmicmeow/odu-acm into gh-pages
Merge branch 'gh-pages' of github.com:stanzheng/odu-acm into gh-pages
junkMerge branch 'gh-pages'

Conflicts:
	index.html
removed some old commits
Merge branch 'master' of github.com:cosmicmeow/odu-acm
archive and update