Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git

Conflicts:
	POS/test/StockTableModelTest.java
Merge branch 'master' of https://github.com/MadisKarli/TeamEdward.git