glLinkProgram(shaderProgram); //Re-link shader program to update attribute locations
https://github.com/sn0w75/MikuMikuPenguin/issues/30
https://github.com/sn0w75/MikuMikuPenguin/issues/30
https://github.com/sn0w75/MikuMikuPenguin/issues/30
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/viewer.cpp
Update README.md

* Added "How to decide which you use git branch" in Japanse
スペーシング修正、　IF, =
スペーシング　引き数、for
//***Pull Display Frame Info***、PMXDisplayFrameElementの箇所e、element->targetはboolなのでMorph,Bone判定をそれに合わせた。
各種structへの代入をmiku.read((char*)&..., 4)スタイルに統一して一時変数を削除。boolへの代入も同じ方法へ変更した。
Fix merge conflicts with shinokaro pull request
Merge branch 'master' of https://github.com/shinokaro/MikuMikuPenguin into shinokaro-master

Conflicts:
	shaders/bulletDebug.vert
	shaders/model.vert
	src/viewer.cpp
Missed merge conflicts in bulletDebug.vert/.frag
Merge branch 'yabuki-master'
Added debug code for IK

dumped text is euler angles in degree (csv format)
Changed to stop calling animation functions after animation is finished

This is useful when comparing debug data of IK.
Implemented IK angleLimit

This may fix #22
added Viewer::fpsCount
added Viewer::fpsCount
added Viewer::fpsCount
structの追加（VMDLightFrame, VMDSelfShadowFrame, VMDInfoIK, VMDShowIKFrame）