workspace
Merge branch 'master' of https://github.com/IndexOutOfRange/ProjectDIAW

Conflicts:
	AppliAndroid/.idea/workspace.xml