Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   .gitignore
	modified:   Makefile
	modified:   README.md
	modified:   yahtzee.c
	modified:   yahtzee.h
Merge branch 'master' of github.com:brotatos/yahtzee