Settings Screen
Contact listener
Merge branch 'master' of https://github.com/APesate/Final_Project
Changes
Merge branch 'master' of https://github.com/APesate/Final_Project

Conflicts:
	AirHockey/AirHockey/HelloWorldLayer.mm
	AirHockey/AirHockey/MenuLayer.mm