first commit on laptop
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
intent and internal storage working