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

Conflicts:
	Week-5/phil_emilyr.R
git issues