Nicer login to main menu
8 buttons on main menu
Updated shop 4 across 2 down grid
Stock test done
Merge branch 'niall'

Conflicts:
	src/Shop.java
Merge branch 'master' of https://github.com/fcpteam1/project
Merge branch 'master' of https://github.com/fcpteam1/project
Merge branch 'niall'
2 x 4 shop
User Test done
Tabbed Main Menu
Tabbed Main Menu
Merge branch 'niall'
Tabbed Main Menu
Extra comment
Merge branch 'master' of https://github.com/fcpteam1/project
Customer,Product,Stock,User Test done
Inovice, Shop,Supplier push
Order Test
Merge branch 'master' of https://github.com/fcpteam1/project
Merging local repo with remote repo
git ignore
classpath