Merge branch 'squirrel' of https://github.com/yonghaoy/python_game_final_project into rpg_test
Merge branch 'master' of https://github.com/yonghaoy/python_game_final_project into rpg_test
Merge branch 'master' of https://github.com/yonghaoy/python_game_final_project into rpg_test
trying to convert_alpha for rams
Merge branch 'rpg_test' of https://github.com/yonghaoy/python_game_final_project into rpg_test
change someting back
Merge pull request #51 from yonghaoy/documentation

updated the README, deleted misspelled cont guidleines
Merge branch 'master' of https://github.com/yonghaoy/python_game_final_project into rpg_test
set png to transpancy
Merge pull request #53 from yonghaoy/rpg_test

merging
added file explanation to cont-guidelines