Aded merge button and boilerplate code
First version uploaded to geroku