Development to Master

Updating the Master from everything I did this Fall Semester.