initial commit
Merge branch 'master' of https://github.com/andymboyle/college-talks
more edits, still not showing up right