Add Puzan's code
Add puzan.o to makefile
Merge branch 'master' of github.com:punzik/lor-contest into punzik-master

Conflicts:
	Makefile