Changes
Merge branch 'master' of github.com:MobileSam/merge_test

Conflicts:
	test.json