Fixed JSON
Merge branch 'master' of github.com:Mindspace/jasmine-as-promised

Conflicts:
	package.json