pro
	modified:   Hajaee_2.aux
	modified:   Hajaee_2.log
	modified:   Hajaee_2.pdf
Merge branch 'master' of github.com:hanskompis/okp

Conflicts:
	Hajaee_2.aux
	Hajaee_2.log
	Hajaee_2.pdf
	Hajaee_2.tex

	modified:   Hajaee_2.aux
	new file:   Hajaee_2.bbl
	new file:   Hajaee_2.blg
	modified:   Hajaee_2.log
	modified:   Hajaee_2.pdf
	modified:   Hajaee_2.tex
	modified:   Hajaee_2.tex.backup
	modified:   Hajaee_2.tex~