Previous commit failed, cleared error and recommiting.
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	MIU/Project1/Js/json.js