Added 4 paddles and removed buttons
Merge branch 'master' of https://github.com/APesate/Final_Project

Conflicts:
	AirHockey/AirHockey/SettingsLayer.m
original file Settinglayer