Fixing the image "jumping" on page load

Signed-off-by: Alan Gardner <alan@armoin.com>
Merge branch 'new_design' of github.com:urfolomeus/edinburgh_stories into new_design

Signed-off-by: Alan Gardner <alan@armoin.com>

Conflicts:
	app/assets/javascripts/scripts.js