Add basic texture to rooms
Map the texture correctly.
Merge branch 'master' of
https://github.com/ChaoHou/Swen222-Group-Project

Conflicts:
	Group-project/src/Main.java
	Group-project/src/gameworld/Wall.java
Add a backup folder
Updated room files
Merge branch 'master' of
https://github.com/ChaoHou/Swen222-Group-Project

Conflicts:
	Group-project/src/control/Player.java
Merge branch 'master' of
https://github.com/ChaoHou/Swen222-Group-Project

Conflicts:
	Group-project/src/Main.java
	Group-project/src/control/Player.java
Fixed werewolf direction bug
Update opengl by using FloatBuffer
Create Box class for rendering
Now you can pick up containers
Move the selecting logic to Box class
Test
Simple merge, Just copy the non-conflict file
Merge remote-tracking branch 'origin/John'

Conflicts:
	Group-project/src/control/Player.java
	Group-project/src/gameworld/Container.java
	Group-project/src/ui/GameFrame.java
Bug need to fix
Last commision couldn't run. Fixed it
Aloud surpise combat to be possible.
Improved aesthetics of some screens
Made a title screen.
Working on game aesthetics
Surprise combat works completely.