Merge pull request #1 from Joshndroid/master

message
Merge pull request #2 from Joshndroid/cm-11.0

Merge pull request #1 from Joshndroid/master