styling voting page
more styling
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