start fresh
some conflict issues

Merge branch 'gh-pages' of github.com:einarhjorleifsson/mac into gh-pages

Conflicts:
	index.html