Cleaning up testing files
Merge remote-tracking branch 'origin/master'
Cleaning up junk files