Committing these files to get them out of my working set
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	.idea/workspace.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Very basic entity-component skeleton in place
Merge remote-tracking branch 'origin/items-on-maps' into items-on-field
Renaming Component.java to meet standards
Basic Entity-Component skeleton in place with 1 skeletal component