changed 2 spaces indentation to 4 in specs
Merge branch 'master' into fix-spec-indenting

Conflicts:
	jasmine_testing/static/jasmine_testing/specs/EditorSpec.js
	jasmine_testing/static/jasmine_testing/specs/GameStateSpec.js
Merge branch 'master' into fix-spec-indenting

Conflicts:
	jasmine_testing/static/jasmine_testing/specs/GameStateSpec.js
Merge pull request #22 from hellochar/fix-spec-indenting

changed 2 spaces indentation to 4 in specs
Merged with master