renamed ViewController to ViewController1 (and associated nib file)
Merge branch 'master' of github.com:boundsj/iOS-UIAutomation-testing