styling voting page
more styling
Merge pull request #28 from heymattlauer/CalculateVotes

Calculate votes
Merge branch 'master' of github.com:Jr-Rooster-The-2nd/Chowdown into rank_restaurant_xml

Conflicts:
	app/src/main/res/layout/activity_ranking.xml
fixed merge conflicts and submitting votes logs data
Merge pull request #29 from knnyluk/rank_restaurant_xml

Rank restaurant xml + merge conflict fix
adding up button to settings activity
Merge branch 'master' of github.com:Jr-Rooster-The-2nd/Chowdown into settings_up_button
Merge pull request #30 from snorham/settings_up_button

Settings up button
adding up button detail activity
Merge branch 'master' of github.com:Jr-Rooster-The-2nd/Chowdown into detail_up_button
Merge pull request #31 from snorham/detail_up_button

Detail up button
Very basic imports. Code is totally not functional right now.
rank restaurant view creates Vote object
Vote submit button saves vote to Parse, but need a way to get each Restaurant's Parse objectid
votes are submitted with pointers to restaurants
removed unused hashmap
Merge pull request #32 from knnyluk/restaurant_voting

Restaurant voting works and writes to Parse
Moving more code around, trying to fix errors.
Resolving merge conflict