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

Conflicts:
	DSG/src/com/dicks/dao/LogDAO.java