fds
Merge remote-tracking branch 'origin/master'

Conflicts:
	DSG/smallTest.log
	DSG/src/com/dicks/engine/Util.java
Merge branch 'master' of https://github.com/alexfz420/DSG.git

Conflicts:
	DSG/smallTest.log
Merge branch 'master' of https://github.com/alexfz420/DSG.git

Conflicts:
	DSG/WebContent/css/progressbar.css
	DSG/smallTest.log
	DSG/src/com/dicks/rules/newRule_joe.drl
fd
Merge remote-tracking branch 'origin/master'

Conflicts:
	DSG/smallTest.log