fix make file
Merge branch 'master' of github.com:38/adam

Conflicts:
	.gitignore
merge