aslyn updates
Updated things
Merge branch 'master' of https://github.com/jeche/dehackathon2
Merge pull request #8 from Sara-lily/master

Updated puppy
Added a call to local storage
Merge pull request #9 from Sara-lily/master

Added a call to local storage
Conflicts resolved