fixed / resolved merge issues.  Template is ready to roll! Will now begin working on styling