Fixed scraper to work
Merge branch 'master' of https://github.com/mpickering/group-4-practical
move parse.py to parser.py
manual merge of parser file