clean up
Merge remote-tracking branch 'origin/master'

Conflicts:
	Browser/Browser/MainWindow.xaml.cs
	Browser/Browser/bin/Debug/Browser.exe
	Browser/Browser/bin/Debug/Browser.pdb
	Browser/Browser/obj/Debug/Browser.exe
	Browser/Browser/obj/Debug/Browser.pdb
	modified:   Browser/Browser/MainWindow.xaml.cs
	modified:   Browser/Browser/bin/Debug/blockedsites.cfg
Merge branch 'master' of https://github.com/mateozoto/cpsc481

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