Nicer login to main menu
8 buttons on main menu
Updated shop 4 across 2 down grid
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