new file:   .gitignore
	new file:   Makefile
	new file:   README.md
	new file:   gr-final.tex
	new file:   my.sty
	new file:   part1/Makefile
	new file:   part1/my.sty
	new file:   part1/part1.tex
	new file:   part1/sec2-1.tex
	new file:   part1/sec2-2.tex
	new file:   part2/Makefile
	new file:   part2/chap1.tex
	new file:   part2/my.sty
	new file:   part2/part2.tex
	new file:   part3/Makefile
	new file:   part3/chap1.tex
	new file:   part3/my.sty
	new file:   part3/part3.tex
Merge branch 'master' of https://github.com/shelanoir/gr-final

Conflicts:
	.gitignore
	README.md

	modified:   .gitignore
	modified:   README.md