Merge branch 'master' of https://github.com/AT13B02/GL into dev/texture

Conflicts:
	framework/framework.suo
ライトを更新
Merge branch 'dev/texture' of https://github.com/AT13B02/GL into dev/light
テストファイルの追加
Merge branch 'dev/light'