fixed makefile and gitignore
Merge branch 'master' of github.com:lindvi/ID2200