Merging
'Merge branch 'master' of https://github.com/silne30/SimStarter

Conflicts:
	.gitignore
	.idea/libraries/SWT.xml
	.idea/workspace.xml