conferences
Merge branch 'master' into conferences
connects conferences, but probs with tex
Merge pull request #75 from tanvirt/conferences

Conferences