making sure my things are up to date
Merge branch 'master' of https://github.com/OxiStudios/NASCAR

Conflicts:
	.idea/workspace.xml
making sure everything is up to date