userDAOTest
h 'master' of http://github.com/Ico91/Articles

Conflicts:
	derby.log