fixed conflict
added loading image before game
added some extra levels
Merge branch 'qa' into development
removed flips, commented css, small changes
added sounds
fixed link syles
ignored unrelated data
added ability to mute, flipped b&w behaviour
Merge branch 'development' into qa

Conflicts:
	story.json
Merge branch 'qa' into gh-pages