setting up repo on my computer
merge;
merge
fixed pagination numbering