merge with fix photo stream
Merge branch 'master' of https://github.com/kiracp/CatPix
updated button layout
Merge branch 'master' of https://github.com/kiracp/CatPix

Conflicts:
	app/src/main/java/com/kiraprentice/catpix/PhotoStreamActivity.java
update
Fix merge conflicts
Revert 4a06d1e..771311f

This rolls back to commit 4a06d1e8bbd829da31471d2dd48d28aeaf3e03ab.
Added toolbar to homepage with secret button
Cleaned up code from last commit
ui for button
fixed UI
new login button
toolbar configured
Merge master with buttons