add ID
Merge branch 'master' of github.com:BRoddeck/TeamYellow-HP

Conflicts:
	inc/css/design.css