css added
blog added
Merge remote-tracking branch 'upstream/master'

Conflicts:
	gps/gps1.1.html