Some changes
Merge branch 'master' of https://github.com/ResidentBiscuit/CM331
Delete redundant file