Very basic imports. Code is totally not functional right now.
Moving more code around, trying to fix errors.
Resolving merge conflict
Unknown changes, sorry. More to come.
Addressing merge conflicts.
fixing loginFragment/ making it show itself
Editing code to be able to grab restaurants for submitted votes. Seems to grab ALL the restaurant names.
Merge pull request #34 from snorham/login_dialog_fix

fixing loginFragment/ making it show itself
stashing changes
committed
Merge pull request #35 from KateCatlin/making_new_main_fragment

Adding PostVoteActivity and parcel able all through app to pass ChosenLunch info through
Adding Multimaps from Google Guava. Using Multimaps to pull out information from Parse and use it elsewhere.
Adding some additional logging messages to figure out when maps and ArrayLists get filled.
Creating username login for parse
Adding login functionality
Votes now have pointer to current user
Merge pull request #36 from KateCatlin/making_new_main_fragment

Making new main fragment
Merge branch 'master' into add_users

Conflicts:
	app/src/main/java/com/example/chowdown/activities/MainActivity.java
Merge pull request #37 from knnyluk/add_users

Add users
Tweaking a few more things. Trying to add a listener for data that's ready.