update
Merge branch 'master' of https://github.com/LittleChick/nfic_app

Conflicts:
	faculty_2.html
	faculty_3.html