upload laptop
Merge branch 'master' of https://github.com/Eslem/JavaWorkSpace-DAM

Conflicts:
	AD/Patterns