moved index2 layout to index
Merge branch 'master' of https://github.com/californiavol/charlesbrownroberts.portfolio

Conflicts:
	assets/images/main-logo.png
Merge branch 'master' into imac