bernhard's app merge
bower crypto
Merge pull request #2 from jojoaddison/elephant

Elephant