reformatting home page to a grid view. Need images for menu, and ordering buttons, and need to make the badges button look a lot better cuz it looks like a 3 year old did it, sorry im not a graphic designer.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/wine/cmsc436/wine/WineActivity.java
	app/src/main/res/layout/home.xml