ignore user data
Merge branch 'master' of https://github.com/lukeforehand/aletrader

Conflicts:
	src/main/ios/AleTrader.com/AleTrader.com.xcodeproj/project.xcworkspace/xcuserdata/Linz.xcuserdatad/UserInterfaceState.xcuserstate