Moved to lab
Merge branch 'master' of https://github.com/MattPetitt/ProjectPenguin

Conflicts:
	.DS_Store
	Helpful Codes/fastMerge.py
	Lab/fastMerge.py
	fastMerge.py
company naming