removed error
Merge branch 'develop' of https://github.com/fluffels/hamster into develop