Added volume controls & cleaned up fade out
Merge branch 'volume'

Volume controls added