pickaxe...

merge manually probably....
Failed to properly save the scene file during the last commit, which
caused problems.
Removing superfluous cube models that are not components we need.
Committing meta files like they should be.
Merge branch 'Ari_victorCollab_12_6_2013'

Conflicts:
	Assets/Animations/PickaxeSwing.anim.meta
	Assets/Cube.prefab.meta
	Assets/Models/CrappySword.prefab.meta.orig
	Assets/Models/Materials/Material_002.mat.meta
	Assets/Models/ore 1.prefab
	Assets/mainGame.unity
Patched everything to allow the mining scripts to work. Presently mining
only hits blocks on the ground due to bugs with ray casting, but hopefully
that will be addressed soon.