still working on asynctask
Merge remote-tracking branch 'origin/chris'