trying to make github happy :(
pleeease....
fixing github stuff

Merge branch 'master' of https://github.com/PermuteSeminar/PermuteSeminar-2014

Conflicts:
	Week-4/figure/.gitignore
	Week-4/figure/unnamed-chunk-3.png
	Week-4/figure/unnamed-chunk-7.png
etc
what
more
Merge branch 'master' of https://github.com/PermuteSeminar/PermuteSeminar-2014