adding street, begin bouncer stuff
Merge branch 'master' of github.com:mrfreester/sp1