Adding new files.
removed test files
clear bonus file
deleted files and folder
fixed conflicts with the merging process