updated small tweaks\
Merge branch 'master' of https://github.com/priyasaini/aakash_app
updated images
updated merge conflicts