lab #4 template ready for class
repaired merge