fixed the magnitude math problem
fixing ray bug
Merge remote-tracking branch 'origin/master' into Eric-Dev
fixed the fix
added content to lab
added the shield sprite
Factory Level Done?
fixed the fix
added content to lab
added the shield sprite
Factory Level Done?
fixed conflict
stuff added
fix conflicts in content project