Edits
Merge branch 'master' of https://github.com/dzhuyx/inclassfeb62014

Conflicts:
	get_faculty_names.R