added junit jars
Merge remote-tracking branch 'origin/RobAndBen' into RobAndBen

Conflicts:
	.idea/artifacts/web_war_exploded.xml
	SkyAccessoriesWebsites.iml
Added dependencies
Merge remote-tracking branch 'origin/RobAndBen' into RobAndBen

Conflicts:
	.idea/artifacts/web_war_exploded.xml
	SkyAccessoriesWebsites.iml
Changed