Merge branch 'master' of https://github.com/Bastinasii/Trololol

Conflicts:
	Antivirus/src/antivirus/Antivirus.java