fills out some of the app and fixes the scraper
corrects spec to comment out unwanted lines, updates spec for student class, updates app
fixes merging problems