Fixed teh assets.
Some stuff
Fixed all the issues with the jittery camera!
Scott's Shitty Shit
Scott's Shitty Shit
Some resource diddling.
Merged Scott's shitty shit.
Finished all the weapons initial placement.
Scale of Form
wat?
Removed Scaleform Dir
Merge branch 'master' of https://github.com/NGonGames/GlobalGamJam2014

Conflicts:
	Assets/Materials/Thumbs.db
sad day
boop boop
Merge of the century
wat
All the merges should be done.
f@#$ unity prefabs,
THE META FILES ARE HERE
Moar changes.