deleting docpad.db
first files upload
removing DS_Store and other changes
merging