merged notaz+liar
fixed makefile to work with sebt3's toolchain
removed unexisting file from project