index1 fix! mac
Merge branch 'master' of https://github.com/doppleddiggong/test

Conflicts:
	index.txt