stupid changes

Signed-off-by: unknown <x57757@USMANBUX57757.usma.ds.army.edu>
resolved merge conflicts

Signed-off-by: unknown <x57757@USMANBUX57757.usma.ds.army.edu>
fixed git ignore

Signed-off-by: unknown <x57757@USMANBUX57757.usma.ds.army.edu>