[andrew/Augustine] updating root with changes in edtrac