Merge branch 'master' of https://github.com/AndroidSquad/ColoRistance
New manigest
Revert "New manigest"

This reverts commit e9e3b249f462773bbb963c36c937249287215608.
Merge branch 'master' of https://github.com/AndroidSquad/ColoRistance
Put a comment in main. You know you want to, just do it!
Merge branch 'master' of https://github.com/AndroidSquad/ColoRistance