This commit is a test to see if I can interact and edit the project,
please ignore and I will remove it post haste
Added MainActivity with Fragments
Merged Changes
Fixed bad merge
Merged Master and Grant
Fix Merge