added ids
dimensionsMerge branch 'master' of https://github.com/bitterfly/6a

Conflicts:
	web/css/main.css
Merge branch 'master' of https://github.com/bitterfly/6a