Joystick
Merge branch 'master' of github.com:ivanepifanov/Barabash

Conflicts:
	Barabash.xcodeproj/project.pbxproj
	Barabash/Base.lproj/Main.storyboard