Sat update
Merge remote-tracking branch 'origin/master'

Conflicts:
	CSS/MainStyle.css
	home.html
home update
Merge remote-tracking branch 'origin/master'

Conflicts:
	CSS/MainStyle.css
	home.html
	index.html