Wall'd
Merge branch 'master' of github:Advael/downtop

Conflicts:
	makefile
Further changed makefile