WorkingCopy
Merge branch 'master' into WorkingCopy

Conflicts:
	index.html
First draft
Color and content changes, main.html created
updated images