Mehul causing merge conflicts
Merge branch 'master' of https://github.com/srachit/crashcash
Merge branch 'master' of https://github.com/srachit/crashcash
Mehul screwed his code again