Merge branch 'master' of github.com:oSoc13/CityLifePatterns into age-weight-fix
Merge branch 'dev' into age-weight-fix
changed acces control allow orign
possible age weight fix
extra print statement to debug
this fix might actually fix the age weight problem
age weight fix working, tested and approved