asd
Merge branch 'master' of https://github.com/Judahh/IOSGas

Conflicts:

IOSGas/IOSGas.xcodeproj/project.xcworkspace/xcuserdata/Judah.xcuserdatad
/UserInterfaceState.xcuserstate