Merge remote-tracking branch 'origin/master' into Justin's-Update
Revert "Update background"

This reverts commit 91181004c2b724d370457dda638950946bf8ee40.
Added crosshair. Changed meteor sprite.
Remove psd file
Merge remote-tracking branch 'origin/Wen-Ting'
Merge remote-tracking branch 'origin/master' into Justin's-Update
Cat class completed
Merge pull request #2 from FatsGW/master

Cat class completed
Updated GameMap to integrate with Character
Merge pull request #4 from FatsGW/GW's-branch

Updated GameMap to integrate with Character
shifted BaseCat class and updated Android.mk
Update Character and CharAI class functions

Character AI updates the states of the character in the update function.
Merge pull request #5 from FatsGW/master

shifted BaseCat class and updated Android.mk
Merge pull request #6 from gapchan89/Justin's-Update

Justin's update
Updated BaseCat. Fixed all other classes. All Dropbox classes are in now.

-updated Android.mk
-Added destructor for BaseCat
-Added dying function for dying animation and EnumCatState
-Fixed Levels, CatSpawnScript, CatSpawnSet, LevelLoader
Update Character and AI functions
Updated CatsManager
Merge remote-tracking branch 'origin/GW's-Branch'
Update Character and AI functions
Merge remote-tracking branch 'origin/master' into GW's-Branch