<ion-view view-title="Chapter Info">
  <ion-content padding="true" class="tabs-content has-header" ng-controller="ChapterInfoController">
    <div class="item item-text-wrap">
      <h2 class="padding-top">{{selectedSound.title}}</h2>
      <p class="padding-top">{{selectedSound.description}}</p>
    </div>
  </ion-content>
</ion-view>

<ion-view view-title="Chapter Info">
  <ion-content padding="true" class="tabs-content has-header" ng-controller="ChapterInfoController" ng-class="{'has-footer': $root.mediaPlaying}">
    <div class="item item-text-wrap">
      <h2 class="padding-top">{{selectedSound.title}}</h2>
      <p class="padding-top">{{selectedSound.description}}</p>
    </div>
  </ion-content>
</ion-view>

Fix merge conflict for realsies this time
Fix merge conflict for realsies this time
