Initial git -- not tested my Uni Work
Merge https://github.com/Timopheym/EMME

Conflicts:
	.idea/.name
	.idea/encodings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/scopes/scope_settings.xml
	.idea/vcs.xml
	.idea/workspace.xml