minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	webpage.html
Merge branch 'master' of https://github.com/bdunigan/CP-std-2014

Conflicts:
	images/frame16/web/4.25x5.75d.png