Commiting files
Merge branch 'master' of https://github.com/jdinndorf10/WKO-Project

Conflicts:
	WKO.css
	index.html