Useless comiit
Merge branch 'master' of https://github.com/Bipsy/CS360
Merge branch 'master' of https://github.com/Bipsy/CS360

Conflicts:
	3_lab/src/downloadAccelerator.py
Inserted changes from Zappala's repo