Merge pull request #4 from SethKips/master

Updated Shop UI
Added different types of packs with different amount of the rarities. Also found and fixed the bug with no push method for the user.pool.
Merge pull request #5 from SethKips/master

Updated Main Menu UI
Changed the upgrade stuff to have its own form. Added the name of the opponent while you duel. Finalized some work on booster packs.
Merge branch 'master' of https://github.com/Fippe94/openEtG

Conflicts:
	ui.main.js
Fixed minor text issues, as well as moving the oracle card.
Asset/Code Cleanup

Switched most assets to sprite sheets
Some general code cleanup
More code cleanup
Merge remote-tracking branch 'upstream/master' into dev
Updated Shop UI + New Image Loading Method

The shop UI has been updated:
	-New background
	-Buttons match the new main menu UI
	-Booster images updated
	-Font now matches the main menu
	-'g' replaced by the gold icon
	-Popup box shows large pictures of cards when a pack is bought

New Image Loading Method
	-Transferred most images to sprite sheets
	-Images (other than null.png) are now loaded in by AssetLoaders
	-Moved all images from root into the assets folder
	-The last argument of makeButton now takes a texture, loaded by
	the asset loaders or otherwise