changes to order
changes to order
merging
empty commit
empty commit
changes to abstractmapper
Merge branch 'master' of https://github.com/BBackerry/SOEN387

Conflicts:
	src/dataMapper/AbstractMapper.java
	src/dataMapper/OrderMapper.java
	src/dataMapper/ProductMapper.java
	src/domain/Customer.java
merges
Merge branch 'master' of https://github.com/BBackerry/SOEN387