Delete workspace.xml
Merge branch 'master' of /home/sander/grive/School/Kwartaal 1/Project local/A-Pc with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	Crawlers/pccrawler/pccrawler/items.pyc
	Crawlers/pccrawler/pccrawler/pipelines.pyc
	Crawlers/pccrawler/pccrawler/settings.pyc
	Crawlers/pccrawler/pccrawler/spiders/Davey.pyc
	Crawlers/pccrawler/pccrawler/spiders/__init__.pyc
	Crawlers/pccrawler/pccrawler/spiders/afuture.pyc
	Crawlers/pccrawler/pccrawler/spiders/azerty.pyc
	Crawlers/pccrawler/pccrawler/spiders/bob.pyc
	Crawlers/pccrawler/pccrawler/spiders/bol.pyc
	Crawlers/pccrawler/pccrawler/spiders/computerland.pyc
	Crawlers/pccrawler/pccrawler/spiders/informatique.pyc
	Crawlers/pccrawler/pccrawler/spiders/paradigit.pyc
	Crawlers/pccrawler/pccrawler/spiders/tweakers.pyc
	Website/APc/__init__.pyc
	Website/APc/settings.pyc
	Website/APc/urls.pyc
	Website/APc/wsgi.pyc
	Website/pcbuilder/__init__.pyc
	Website/pcbuilder/admin.pyc
	Website/pcbuilder/migrations/__init__.pyc
	Website/pcbuilder/models.pyc
	Website/pcbuilder/templatetags/__init__.pyc
Merge remote-tracking branch 'origin/master'

Conflicts:
	Crawlers/pccrawler/pccrawler/items.pyc
	Crawlers/pccrawler/pccrawler/pipelines.pyc
	Crawlers/pccrawler/pccrawler/spiders/bol.pyc
	Crawlers/pccrawler/pccrawler/spiders/paradigit.pyc
	Crawlers/pccrawler/pccrawler/spiders/tweakers.pyc
ROBIN JE BABY IS KAPOT
ROBIN JE BABY IS KAPOT
fdsa
Merge branch 'master' of https://github.com/A-Maze/A-Pc

Conflicts:
	.gitignore
	Crawlers/pccrawler/pccrawler/items.pyc
	Crawlers/pccrawler/pccrawler/pipelines.pyc
	Crawlers/pccrawler/pccrawler/settings.pyc
	Crawlers/pccrawler/pccrawler/spiders/Davey.pyc
	Crawlers/pccrawler/pccrawler/spiders/__init__.pyc
	Crawlers/pccrawler/pccrawler/spiders/afuture.py
	Crawlers/pccrawler/pccrawler/spiders/afuture.pyc
	Crawlers/pccrawler/pccrawler/spiders/azerty.pyc
	Crawlers/pccrawler/pccrawler/spiders/bob.pyc
	Crawlers/pccrawler/pccrawler/spiders/bol.pyc
	Crawlers/pccrawler/pccrawler/spiders/computerland.pyc
	Crawlers/pccrawler/pccrawler/spiders/informatique.pyc
	Crawlers/pccrawler/pccrawler/spiders/paradigit.pyc
	Crawlers/pccrawler/pccrawler/spiders/tweakers.pyc
	Website/APc/__init__.pyc
	Website/APc/log.log
	Website/APc/settings.pyc
	Website/APc/urls.pyc
	Website/APc/wsgi.pyc
	Website/db.sqlite3
	Website/pcbuilder/__init__.pyc
	Website/pcbuilder/admin.pyc
	Website/pcbuilder/migrations/__init__.pyc
	Website/pcbuilder/models.pyc
	Website/pcbuilder/templatetags/__init__.pyc
	Website/pcbuilder/templatetags/filters.pyc
	Website/pcbuilder/views.pyc