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

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

Conflicts:
	.DS_Store
committ

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

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