Order test finished
User Test done
Merge branch 'master' of https://github.com/fcpteam1/project
Customer,Product,Stock,User Test done
Inovice, Shop,Supplier push
Order Test
Shop class no GUI to test code
Merge branch 'master' of https://github.com/fcpteam1/project
Merging local repo with remote repo
Sale Test and .gitignore
git ignore
classpath
Changed classpath to use JUnit (I think)
Merge branch 'darren'
Merged with Master
Merge branch 'master' of https://github.com/fcpteam1/project/
Merge branch 'master' into darren
ShopNoGUI login menu started
Update from Shane
Merge branch 'master' of https://github.com/fcpteam1/project
Merge branch 'master' into Shane

Conflicts:
	src/Shop.java
	src/StockTest.java