working on last linker error, template classes must have all implementation at time of compile other wise bad things happen.
linker error messing with again.  no errors
fixed conflict
Merge branch 'master' of github.com:curdog/hw1