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

Conflicts:
	about.html
Merge branch 'master' of https://github.com/jdinndorf10/WKO-Project

Conflicts:
	about.html