added both files to make
moved merge code and updated comments
added long list of integers back