pull
Merge branch 'master' of https://github.com/alexfz420/DSG.git

Conflicts:
	DSG/smallTest.log