Cleaned stuff up and got basic graphics working.
HUh.
Merge branch 'master' of https://github.com/whiterson/mockingJay

Conflicts:
	.idea/workspace.xml
Ridding the repo of IDE settings.