Changed files to .scm
Merge remote-tracking branch 'origin/master'
Removed Lol file... Dumb!