prepare to merge with liams changes
Merge branch 'master' of git://github.com/LiamDeGrey/Cluedo
Revert "prepare to merge with liams changes"

This reverts commit 7604fe952a88362ccb7ab1697d3f2b152c68abde.
added weapons to rooms

weapons now draw in rooms and are randomly distributed at the start of
the game. the code to get the images from the res folder has also been
changed
player names are now actually set
Revert "player names are now actually set"

This reverts commit b74ccfe426cca7820a0b93cfbceacd607c44871b.
Merge branch 'master' of git://github.com/LiamDeGrey/Cluedo
Changed png files and added card images

They now contain proper images and transparency.
Unfortunately my screen is quite small, so I have opted to use the small
icons for now, but provided images twice the current size so that we can
scale the board by 2 (which means it wont fit on my screen but it will
look much better)
Merge pull request #6 from foneandrew/master

added weapons into rooms + image files updated