I'm dead
Merge pull request #1119 from jaypoulz/master

I'm dead
Merged some styles
Merge pull request #1120 from jaypoulz/bdAndroidL

Bd android l