Merge remote-tracking branch 'james/master'
Merge remote-tracking branch 'joshua/master'
Merge remote-tracking branch 'james/master'
Changed coin png to have no background.
Merge remote-tracking branch 'george/master'