changed directories structure and Makefile corrections
Merge branch 'master' of https://github.com/kacperkolodziej/ConsoleInterface

Conflicts:
	libConsoleInterface.a