(bugfix) Fixed incorrect VAO attribute location specification
Changed wording in a comment
Moved uniform variable setup in BulletDebugDrawer to after shader program link/bind
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
Fixed an error ('no README') during automake

It was applied by reading http://stackoverflow.com/questions/15013672/use-autotools-with-readme-md
[OS X] added missing options in opengl_LIBS
Improved OpenGL context creation and GLSL version display
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)