Fix incomplete texture
Merge remote-tracking branch 'origin/master' into texturefix
Fix globe on Chrome
Merge pull request #1 from CIS565-Fall-2013/texturefix

Fix incomplete texture and Strange globe in chrome
Merge remote-tracking branch 'upstream/master'

Conflicts:
	part2/frag_globe.js