fixed a few bugs
fixed conflicts
refactored login to use shared preferences to store username and password
removed unused onClick handler