Switched from localstorage to Storage
Merge pull request #17 from recked/master

Switched from localstorage to Storage + modified conditional
Merge pull request #18 from pixelmack/master

Merging master with gh-pages