drawing images!!!
Merge branch 'master' into sad
Types.hs and Player.hs added