updated to merge the two files into one

and strips out the header file of 2013 file so it isn’t repeated