Adding buying and selling functionality to Shop.lua.
Added some safety checks in LevelManager.lua to pass the smoke test.  Also changed how weapons are stored in Shop.lua.
Changed the syntax of some function calls around.
Merge branch 'master' of https://github.com/encephalopathy/wepwep

Conflicts:
	branches/pewpew_corona_port/com/game/Player.lua
Merge branch 'master' of https://github.com/encephalopathy/wepwep
Merge branch 'master' of https://github.com/encephalopathy/wepwep
The player can now equip primary weapons through the shop.  The shop also has carousel changes.
Adding incomplete smoke tester.
Added a better description on how to do collision detection in our game.
Merge branch 'master' of https://github.com/encephalopathy/wepwep

Conflicts:
	branches/pewpew_corona_port/com/game/weapons/primary/SineWaveWeapon.lua
	branches/pewpew_corona_port/com/managers/LevelManager.lua
Moved shop initialization to MainMenu.lua.