changed Toast call to use Xtendroid toast() method
trying to resolve git conflicts
trying to resolve git conflicts
Merge branch 'git_messing_with_me'