updated data
fix merge conflict
updated test schedules
Merge branch 'master' of https://github.com/priyasaini/aakash_app