updated layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	bathroombuddy.html
Changed id in javascript