Reverted and reapplied changes from previous commits
Fixed interface so app is now compatible with iOS 7 and iOS 6, began work on iPhone interface in new storyboard