makefile
merge with master
make
deleted files
merge master
Merge pull request #2 from lukkm/makefile

Makefile
write bitmap
Merge pull request #3 from lukkm/write-bmp

write bitmap
[encription] merged master into encription.