pre douglas merge
merged with douglas
finished lab5
cleaned up temp files