renaming scraper spec
Merge branch 'master' of github.com:andrewhl/AdvancedStudyRoom
setting up user authorization
Merge branch 'master' of github.com:andrewhl/AdvancedStudyRoom

Conflicts:
	config/routes.rb