mentors in alpha
added interns
updating people section
fixing conflicts
Merge pull request #57 from postcode/people

People