Merge branches 'version3' and 'asdf' into version3
start making networkg and computer configure files