Initial JSON file
Initial JSON file
Merge branch 'master' of github.com:chadmlinke/ContactViewer

Conflicts:
	src/edu/umn/contactviewer/Contact.java