MainDisplay stuff added and most of the necessary input parameters
Merge branch 'master' of https://github.com/Porkchop1414/project-internal-frames

Conflicts:
	.idea/workspace.xml