Remove unneccessary files
Merge branch 'master' (back) into assembly
Fix assembler
Merge branch 'assembly'