13.11.2014
Merge branch 'master' of https://github.com/kirkor93/Wbudowane

Conflicts:
	Projekt/main.c