prepare to pull

Signed-off-by: adkellas <andreas.kellas@usma.edu>
merge conflicts resolved

Signed-off-by: adkellas <andreas.kellas@usma.edu>