Resolve Changes
Resolve merge conflict
Ensure Consistent Styling Throughout Views
Merge pull request #21 from mattwojo/AppCleanup

App cleanup