reverted to working app, added jQuery fade
functionality updated, styled goodly
Merge branch 'brendan'
fix merge conflicts
controller bugfix
Merge pull request #11 from bsusensjackson/bugfix

Bugfix