re added fades
Merge branch 'master' into adding_fades_again
for fun
Merge pull request #106 from red-admirals-2014/adding_fades_again

Adding fades again