clarified new student prompt
fixed merge conflict
Merge branch 'development'