change ignored files
moved hidden RData and Rhistory out of dir
Merge branch 'master' of https://github.com/jnthntatum/bmi212-2014

Conflicts:
	.Rhistory