fixed merge conflicts and added work from Austen, Josh, and JoseLuis