Merge pull request #33 from KateCatlin/making_new_main_fragment

Making new MainFragment
fixing loginFragment/ making it show itself
Merge pull request #34 from snorham/login_dialog_fix

fixing loginFragment/ making it show itself
stashing changes
committed