finish initial test5. need to finish checking
middle of an insane conflict
added initial test 5
finished first submission of test 5
fix merge conflicts
merge with Andrew