output to json
add gitignore
Merge branch 'master' of github.com:madsivas/curiosityathome

Conflicts:
	.gitignore