Modifying gitignore
syncing repo
modifying gitignore
Merge branch 'master' of https://github.com/bayes/Bayes

Conflicts:
	.gitignore