minor changes
Merge branch 'master' of github.com:janastu/dasara-prototype

Conflicts:
	css/theme.css
Merge branch 'master' of github.com:janastu/dasara-prototype

Conflicts:
	index.html
Merge branch 'master' of github.com:janastu/dasara-prototype
Merge branch 'master' of github.com:janastu/dasara-prototype

Conflicts:
	index.html
Image popover
Merge branch 'master' of github.com:janastu/dasara-prototype

Conflicts:
	js/story.js
light box adjustment