nouveau :   .gitignore
Merge branch 'master' of github.com:berettavexee/beblog

Conflicts:
	.gitignore