Merge branch 'master' of https://github.com/deniziskender/GROUP-A

Conflicts:
	SRS-updated.doc