Added alpha channel to new textures.
Merge branch 'master' of
https://github.com/CodeFusionOne/CSCI3130_Project.git

Conflicts:
	resources/assets/csci3130_2014_factory/textures/items/factoryStickItem.png