meeting commit
Merge branch 'master' of https://github.com/shhaky/gds_project

Conflicts:
	design/UML/GDS_Design.EAP