faq page
Merge remote-tracking branch 'origin/master'

Conflicts:
	beta/students.html