Added something
Deleted changes
Added new file
Merge branch 'testing'