Merge branch 'master' of https://github.com/mateozoto/cpsc481

Conflicts:
	Browser/Browser/bin/Debug/blockedsites.cfg