Ahasasjain

Results 2 comments of Ahasasjain

resolved conflicts please review @thecuriousteam

resolved conflicts, the branch is ready to merge now please review @thecuriousteam