modified:   OKP_1_Hajaee.log
	modified:   OKP_1_Hajaee.pdf
	modified:   OKP_1_Hajaee.synctex.gz
	modified:   OKP_1_Hajaee.tex
	modified:   OKP_1_Hajaee.tex.backup
	modified:   OKP_1_Hajaee.tex~
	modified:   OKP_1_Hajaee.aux
	modified:   OKP_1_Hajaee.log
	modified:   OKP_1_Hajaee.out
	modified:   OKP_1_Hajaee.pdf
	modified:   OKP_1_Hajaee.synctex.gz
	modified:   OKP_1_Hajaee.tex
	modified:   OKP_1_Hajaee.toc
Merge branch 'master' of github.com:hanskompis/okp

Conflicts:
	OKP_1_Hajaee.aux
	OKP_1_Hajaee.log
	OKP_1_Hajaee.pdf
	OKP_1_Hajaee.tex
	OKP_1_Hajaee.toc

	modified:   OKP_1_Hajaee.aux
	modified:   OKP_1_Hajaee.log
	modified:   OKP_1_Hajaee.pdf
	modified:   OKP_1_Hajaee.synctex.gz
	modified:   OKP_1_Hajaee.tex
	modified:   OKP_1_Hajaee.toc