changed everything
madeoftablescommit
Merge branch 'dev' of github.com:YasminRazavi/GroupTest into feature1

Conflicts:
	a.txt
submitting latest
ch 'dev' of github.com:YasminRazavi/GroupTest into feature1

Conflicts:
	a.txt