committing latest changes

Signed-off-by: Nicholas Kamper <kampernj@rose-hulman.edu>
merged

Signed-off-by: Nicholas Kamper <kampernj@rose-hulman.edu>