Add all the student side of the site
Fix merge issues