Small changes

Updated files in .gitignore file, and made a few minor changes to
Makefile.
Merge branch 'master' of https://github.com/tmarkley/Poker

Conflicts:
	.gitignore
	Makefile