first version

first version
plus git
Merge remote-tracking branch 'origin/master' into gh-pages

Conflicts:
	css/apple.min.css
	index.html