main activity is now scrollable (no more horizontal issues)
Merge branch 'master' of ssh://git@github.com/jessicayuen/CMPUT301T13.git