eclipse app regsiters and parses json
Merge branch 'master' of github.com:army-of-dumbledore/pennappsF13

Conflicts:
	PollioProject/.idea/misc.xml
	PollioProject/.idea/workspace.xml