finished faculty rough version
Merge branch 'master' of github.com:consiler/dlg123013
qwer