switched id's into classes and combined
Merge branch 'master' of ssh://github.com/j105rob/scram

Conflicts:
	http/css/style.css