Added Pair class
Added a Pair class
Template done
Finished
Finished, attempting to merge