Academics main content added
fixed conflicts

Conflicts:
	research.html