huh?
Merge remote-tracking branch 'upstream/master'
huh
fixing merge conflict... possibly
Merge branch 'master' of github.com:ajbtee/i-can-dig-it
removing mapfragment class
Merge pull request #7 from snorham/master

removing map fragment class
Deleting MapFragment so I can pull from upstreammmm
Merge remote-tracking branch 'upstream/master'

I'm just pulling some stuff.