fixed small stuff in layout
merged and added removal of trash image when deck becomes empty
Merge branch 'master' of https://github.com/Zpiritual/fluxx