haffo
add shop item layout completed
Update activity_app_main.xml
Merge remote-tracking branch 'origin/additem'
Merge branch 'master' of https://github.com/herath/MAD_app