Merge pull request #93 from GorillaApp/bio-controller

Add bio controller
Merge remote-tracking branch 'origin/master' into local-storage