Commit
FINAL COMMIT
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.DS_Store
	InQueue.h
	iosChallenge/ViewController.m