gitignore
gitignore
merge gitignore conflict

Merge branch 'master' of https://github.com/scottdbrown/stat540-tissueSpecificMethylation

Conflicts:
	.gitignore