Add story integration
Merge branch 'master' of github.com:omri/Streets