Starting a new era, should help fix the myriad of errors
No changes other than comments, the GUI was just bugging me about changes
Added gitignore
Merge branch 'master' into develop

Conflicts:
	graphics