Update base.html
Update faculty.html
Separated web application
Merge branch 'master' into requirements

Conflicts:
	templates/base.html