fitting-room first test
Merge branch 'gh-pages' of https://github.com/chernikov-v/gloria into gh-pages

Conflicts:
	css/style.css
	js/app.js
	js/controllers.js
	templates/tabs.html