fetching
minor fixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	scss/_settings.scss
json and minor fixed

new json and minor fixed
background zhang
starting with intro
fixing gruntfile
Merge branch 'brassy--master'
fix didier's story
starting with start.html
with word animation on start.html
starting with coriandoli
fixing variation after helelper
fix for merging
with a solution for win/loose pages
minor fixes on win/loose text
Merge remote-tracking branch 'upstream/master'
minor fixes
different risk animation + safari bugfix
Merge branch 'brassy--master'