Assembler: done some renamings to avoid name clash
Programs: Adapted makefile
Merge branch 'master' of github.com:svenstaro/uni-projekt