merged with tabbed-app
Merge branch 'master' of https://github.com/coldstar96/cse403 into summaryfragment
made summary screen a fragment of main activity
merged with joseph's branch
merged with master
merged with master
Merge pull request #116 from coldstar96/summaryfragment

Added summary fragment