Fixed GitHub merging issues
Committing files that should be ignored
fixme test
Merge branch 'fixme'

Conflicts:
	Full Package/Simulation no automation/Simulation.py
automation merge
Merge branch 'automation-merge'
Trying to fix a broken repo
Final repo fix
Merge pull request #58 from sharrington93/master

Poor GitHub merge fix