first basic version of non uniform 5 usesr
Merge branch 'master' into non_unif
okay first version working
Merge branch 'master' into dev