Changed home screen to PhotoGallery

deleted decoy button
Merge branch 'master' of https://github.com/rgardner/steganography

Conflicts:

app/build/generated/source/r/debug/com/github/kevinsawicki/wishlist/R.ja
va
	app/build/generated/source/r/debug/hack4humanity/catpix/R.java

app/build/intermediates/classes/debug/com/github/kevinsawicki/wishlist/R
$string.class
	app/build/intermediates/classes/debug/hack4humanity/catpix/R$id.class

app/build/intermediates/classes/debug/hack4humanity/catpix/R$string.clas
s

app/build/intermediates/classes/debug/hack4humanity/catpix/RootModule.do
t

app/build/intermediates/classes/debug/hack4humanity/catpix/authenticator
/BootstrapAuthenticatorActivity.class

app/build/intermediates/classes/debug/hack4humanity/catpix/core/TimerSer
vice.class

app/build/intermediates/classes/debug/hack4humanity/catpix/ui/BootstrapP
agerAdapter.class

app/build/intermediates/classes/debug/hack4humanity/catpix/ui/BootstrapT
imerActivity.class

app/build/intermediates/classes/debug/hack4humanity/catpix/ui/CheckInsLi
stFragment.class

app/build/intermediates/classes/debug/hack4humanity/catpix/ui/MainActivi
ty.class

app/build/intermediates/classes/debug/hack4humanity/catpix/ui/Navigation
DrawerFragment.class

app/build/intermediates/classes/debug/hack4humanity/catpix/ui/NewsListFr
agment.class

app/build/intermediates/classes/debug/hack4humanity/catpix/ui/UserListFr
agment.class
	app/build/intermediates/dex/debug/classes.dex
	app/build/intermediates/incremental/mergeAssets/debug/merger.xml
	app/build/intermediates/incremental/mergeResources/debug/merger.xml
	app/build/intermediates/manifests/full/debug/AndroidManifest.xml
	app/build/intermediates/res/debug/anim/abc_fade_in.xml
	app/build/intermediates/res/debug/anim/abc_fade_out.xml
	app/build/intermediates/res/debug/anim/abc_slide_in_bottom.xml
	app/build/intermediates/res/debug/anim/abc_slide_in_top.xml
	app/build/intermediates/res/debug/anim/abc_slide_out_bottom.xml
	app/build/intermediates/res/debug/anim/abc_slide_out_top.xml
	app/build/intermediates/res/debug/color/abc_search_url_text_holo.xml
	app/build/intermediates/res/debug/color/nav_text_selector.xml
	app/build/intermediates/res/debug/color/table_text_light_selector.xml
	app/build/intermediates/res/debug/color/table_text_selector.xml
	app/build/intermediates/res/debug/color/text_light_selector.xml
	app/build/intermediates/res/debug/color/text_selector.xml
	app/build/intermediates/res/debug/color/text_title_selector.xml
	app/build/intermediates/res/debug/color/vpi__dark_theme.xml
	app/build/intermediates/res/debug/color/vpi__light_theme.xml
	app/build/intermediates/res/debug/drawable-hdpi-v4/icon.png
	app/build/intermediates/res/debug/drawable-ldpi-v4/icon.png
	app/build/intermediates/res/debug/drawable-mdpi-v4/icon.png
	app/build/intermediates/res/debug/drawable-xhdpi-v4/icon.png
	app/build/intermediates/res/debug/drawable/abc_ic_clear.xml
	app/build/intermediates/res/debug/drawable/abc_ic_clear_holo_light.xml

app/build/intermediates/res/debug/drawable/abc_item_background_holo_dark
.xml

app/build/intermediates/res/debug/drawable/abc_item_background_holo_ligh
t.xml

app/build/intermediates/res/debug/drawable/abc_list_selector_background_
transition_holo_dark.xml

app/build/intermediates/res/debug/drawable/abc_list_selector_background_
transition_holo_light.xml

app/build/intermediates/res/debug/drawable/abc_list_selector_holo_dark.x
ml

app/build/intermediates/res/debug/drawable/abc_list_selector_holo_light.
xml
	app/build/intermediates/res/debug/drawable/abc_search_dropdown_dark.xml

app/build/intermediates/res/debug/drawable/abc_search_dropdown_light.xml
	app/build/intermediates/res/debug/drawable/abc_spinner_ab_holo_dark.xml

app/build/intermediates/res/debug/drawable/abc_spinner_ab_holo_light.xml

app/build/intermediates/res/debug/drawable/abc_tab_indicator_ab_holo.xml

app/build/intermediates/res/debug/drawable/abc_textfield_searchview_holo
_dark.xml

app/build/intermediates/res/debug/drawable/abc_textfield_searchview_holo
_light.xml

app/build/intermediates/res/debug/drawable/abc_textfield_searchview_righ
t_holo_dark.xml

app/build/intermediates/res/debug/drawable/abc_textfield_searchview_righ
t_holo_light.xml
	app/build/intermediates/res/debug/drawable/actionbar_background.xml
	app/build/intermediates/res/debug/drawable/bootstrap_divider.xml

app/build/intermediates/res/debug/drawable/button_background_disabled.xm
l

app/build/intermediates/res/debug/drawable/button_background_enabled.xml

app/build/intermediates/res/debug/drawable/button_background_pressed.xml
	app/build/intermediates/res/debug/drawable/button_background_states.xml
	app/build/intermediates/res/debug/drawable/edit_text_background.xml
	app/build/intermediates/res/debug/drawable/edit_text_cursor.xml
	app/build/intermediates/res/debug/drawable/list_item_background.xml
	app/build/intermediates/res/debug/drawable/main_background.xml
	app/build/intermediates/res/debug/drawable/map_header_background.xml

app/build/intermediates/res/debug/drawable/nav_menu_button_background_di
sabled.xml

app/build/intermediates/res/debug/drawable/nav_menu_button_background_en
abled.xml

app/build/intermediates/res/debug/drawable/nav_menu_button_background_pr
essed.xml

app/build/intermediates/res/debug/drawable/nav_menu_button_background_se
lector.xml
	app/build/intermediates/res/debug/drawable/spinner.xml
	app/build/intermediates/res/debug/drawable/stripe_repeat.xml

app/build/intermediates/res/debug/drawable/table_background_alternate_se
lector.xml

app/build/intermediates/res/debug/drawable/table_background_selector.xml
	app/build/intermediates/res/debug/drawable/vpi__tab_indicator.xml
	app/build/intermediates/res/debug/layout-v11/abc_action_bar_decor.xml
	app/build/intermediates/res/debug/layout-v11/abc_simple_decor.xml

app/build/intermediates/res/debug/layout-v14/abc_activity_chooser_view.x
ml
	app/build/intermediates/res/debug/layout/abc_action_bar_decor.xml

app/build/intermediates/res/debug/layout/abc_action_bar_decor_include.xm
l

app/build/intermediates/res/debug/layout/abc_action_bar_decor_overlay.xm
l
	app/build/intermediates/res/debug/layout/abc_action_bar_home.xml
	app/build/intermediates/res/debug/layout/abc_action_bar_tab.xml
	app/build/intermediates/res/debug/layout/abc_action_bar_tabbar.xml
	app/build/intermediates/res/debug/layout/abc_action_bar_title_item.xml

app/build/intermediates/res/debug/layout/abc_action_bar_view_list_nav_la
yout.xml

app/build/intermediates/res/debug/layout/abc_action_menu_item_layout.xml
	app/build/intermediates/res/debug/layout/abc_action_menu_layout.xml
	app/build/intermediates/res/debug/layout/abc_action_mode_bar.xml
	app/build/intermediates/res/debug/layout/abc_action_mode_close_item.xml
	app/build/intermediates/res/debug/layout/abc_activity_chooser_view.xml

app/build/intermediates/res/debug/layout/abc_activity_chooser_view_inclu
de.xml

app/build/intermediates/res/debug/layout/abc_activity_chooser_view_list_
item.xml
	app/build/intermediates/res/debug/layout/abc_expanded_menu_layout.xml

app/build/intermediates/res/debug/layout/abc_list_menu_item_checkbox.xml
	app/build/intermediates/res/debug/layout/abc_list_menu_item_icon.xml
	app/build/intermediates/res/debug/layout/abc_list_menu_item_layout.xml
	app/build/intermediates/res/debug/layout/abc_list_menu_item_radio.xml
	app/build/intermediates/res/debug/layout/abc_popup_menu_item_layout.xml

app/build/intermediates/res/debug/layout/abc_search_dropdown_item_icons_
2line.xml
	app/build/intermediates/res/debug/layout/abc_search_view.xml
	app/build/intermediates/res/debug/layout/abc_simple_decor.xml
	app/build/intermediates/res/debug/layout/activity_main.xml
	app/build/intermediates/res/debug/layout/activity_photo_stream.xml
	app/build/intermediates/res/debug/layout/bootstrap_timer.xml
	app/build/intermediates/res/debug/layout/checkin_list_item.xml
	app/build/intermediates/res/debug/layout/checkins_list_item_labels.xml
	app/build/intermediates/res/debug/layout/fragment_carousel.xml
	app/build/intermediates/res/debug/layout/fragment_navigation_drawer.xml
	app/build/intermediates/res/debug/layout/item_list.xml
	app/build/intermediates/res/debug/layout/login_activity.xml
	app/build/intermediates/res/debug/layout/main_activity.xml
	app/build/intermediates/res/debug/layout/main_activity_tablet.xml
	app/build/intermediates/res/debug/layout/news.xml
	app/build/intermediates/res/debug/layout/news_list_item.xml
	app/build/intermediates/res/debug/layout/news_list_item_labels.xml

app/build/intermediates/res/debug/layout/support_simple_spinner_dropdown
_item.xml
	app/build/intermediates/res/debug/layout/user_list_item.xml
	app/build/intermediates/res/debug/layout/user_list_item_labels.xml
	app/build/intermediates/res/debug/layout/user_view.xml
	app/build/intermediates/res/debug/menu/bootstrap.xml
	app/build/intermediates/res/debug/menu/global.xml
	app/build/intermediates/res/debug/menu/menu_main.xml
	app/build/intermediates/res/debug/values-af/values.xml
	app/build/intermediates/res/debug/values-am/values.xml
	app/build/intermediates/res/debug/values-ar/values.xml
	app/build/intermediates/res/debug/values-bg/values.xml
	app/build/intermediates/res/debug/values-ca/values.xml
	app/build/intermediates/res/debug/values-cs/values.xml
	app/build/intermediates/res/debug/values-da/values.xml
	app/build/intermediates/res/debug/values-de/values.xml
	app/build/intermediates/res/debug/values-el/values.xml
	app/build/intermediates/res/debug/values-en-rGB/values.xml
	app/build/intermediates/res/debug/values-en-rIN/values.xml
	app/build/intermediates/res/debug/values-es-rUS/values.xml
	app/build/intermediates/res/debug/values-es/values.xml
	app/build/intermediates/res/debug/values-et-rEE/values.xml
	app/build/intermediates/res/debug/values-fa/values.xml
	app/build/intermediates/res/debug/values-fi/values.xml
	app/build/intermediates/res/debug/values-fr-rCA/values.xml
	app/build/intermediates/res/debug/values-fr/values.xml
	app/build/intermediates/res/debug/values-hi/values.xml
	app/build/intermediates/res/debug/values-hr/values.xml
	app/build/intermediates/res/debug/values-hu/values.xml
	app/build/intermediates/res/debug/values-hy-rAM/values.xml
	app/build/intermediates/res/debug/values-in/values.xml
	app/build/intermediates/res/debug/values-it/values.xml
	app/build/intermediates/res/debug/values-iw/values.xml
	app/build/intermediates/res/debug/values-ja/values.xml
	app/build/intermediates/res/debug/values-ka-rGE/values.xml
	app/build/intermediates/res/debug/values-km-rKH/values.xml
	app/build/intermediates/res/debug/values-ko/values.xml
	app/build/intermediates/res/debug/values-land/values.xml
	app/build/intermediates/res/debug/values-large-v14/values.xml
	app/build/intermediates/res/debug/values-large-v4/values.xml
	app/build/intermediates/res/debug/values-lo-rLA/values.xml
	app/build/intermediates/res/debug/values-lt/values.xml
	app/build/intermediates/res/debug/values-lv/values.xml
	app/build/intermediates/res/debug/values-mn-rMN/values.xml
	app/build/intermediates/res/debug/values-ms-rMY/values.xml
	app/build/intermediates/res/debug/values-nb/values.xml
	app/build/intermediates/res/debug/values-nl/values.xml
	app/build/intermediates/res/debug/values-pl/values.xml
	app/build/intermediates/res/debug/values-pt-rPT/values.xml
	app/build/intermediates/res/debug/values-pt/values.xml
	app/build/intermediates/res/debug/values-ro/values.xml
	app/build/intermediates/res/debug/values-ru/values.xml
	app/build/intermediates/res/debug/values-sk/values.xml
	app/build/intermediates/res/debug/values-sl/values.xml
	app/build/intermediates/res/debug/values-sr/values.xml
	app/build/intermediates/res/debug/values-sv/values.xml
	app/build/intermediates/res/debug/values-sw/values.xml
	app/build/intermediates/res/debug/values-sw600dp-v13/values.xml
	app/build/intermediates/res/debug/values-th/values.xml
	app/build/intermediates/res/debug/values-tl/values.xml
	app/build/intermediates/res/debug/values-tr/values.xml
	app/build/intermediates/res/debug/values-uk/values.xml
	app/build/intermediates/res/debug/values-v11/values.xml
	app/build/intermediates/res/debug/values-v14/values.xml
	app/build/intermediates/res/debug/values-vi/values.xml
	app/build/intermediates/res/debug/values-w360dp-v13/values.xml
	app/build/intermediates/res/debug/values-w480dp-v13/values.xml
	app/build/intermediates/res/debug/values-w500dp-v13/values.xml
	app/build/intermediates/res/debug/values-w600dp-v13/values.xml
	app/build/intermediates/res/debug/values-w720dp-v13/values.xml
	app/build/intermediates/res/debug/values-xlarge-v4/values.xml
	app/build/intermediates/res/debug/values-zh-rCN/values.xml
	app/build/intermediates/res/debug/values-zh-rHK/values.xml
	app/build/intermediates/res/debug/values-zh-rTW/values.xml
	app/build/intermediates/res/debug/values-zu/values.xml
	app/build/intermediates/res/debug/values/values.xml
	app/build/intermediates/res/debug/xml/authenticator.xml
	app/build/intermediates/res/resources-debug.ap_
	app/build/intermediates/symbols/debug/R.txt
	app/build/outputs/apk/app-debug-unaligned.apk
	app/build/outputs/apk/app-debug.apk
	app/build/outputs/apk/manifest-merger-debug-report.txt