comminting once againddd
Merge branch 'master' into commiting
1st merging
commiting for conflicts
commintingMerge branch 'commiting'

Conflicts:
	a