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

Conflicts:
Weekly Summaries/Week 2 Summary (EMH-HJL).html
Weekly Summaries/Week 2 Summary (EMH-HJL).md
Merge branch 'master' of https://github.com/PermuteSeminar/PermuteSeminar-2014

Conflicts:
	Weekly Summaries/Week 2 Summary (EMH-HJL).html
	Weekly Summaries/Week 2 Summary (EMH-HJL).md
Merge branch 'master' of https://github.com/PermuteSeminar/PermuteSeminar-2014