Commit bidon
Merge branch 'master' of github.com:Arsaell/EdT

Conflicts:
	dataStoreLocation.loc