Upgrading to lollipop
Merge pull request #63 from Neamar/lollipop

Upgrading to Lollipop