Working on display, saving state here
Create README.md
Merge branches 'master' and 'restruct'

Conflicts:
	README.md
Moving things around
more tweaks
tweaks