fixing loginFragment/ making it show itself
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
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.
Removing a Placeholder.java file.
Addressing merge conflict.
skips restaurant ranking screen if current user has already voted
LunchEvent detail view looks different depending on if current user has voted
Merge pull request #38 from knnyluk/lunchevent_detail_votestatus

Lunchevent detail changes based on whether or not the current user has voted
Changing file names. Trying to store votes locally within a VoteParseGrabberAndCalculator.
Addressing merge conflict.
Changing display on main to show if you've joined a lunch