week5

week5 not finished yet
Merge branch 'master' of https://github.com/tokujin/algo_yuki

Conflicts:
	week03_01/Makefile
	week03_01/Project.xcconfig
	week03_01/addons.make
	week03_01/bin/data/.gitkeep

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/GLUT.nib/objects.nib

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/GLUTClipboard.nib/objects.nib

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/GLUTPreferences.nib/objects.nib

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/GLUTUI.strings

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/InfoPlist.strings

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/GLUT.nib/objects.nib

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/GLUTClipboard.nib/objects.nib

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/GLUTPreferences.nib/objects.nib

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/GLUTUI.strings

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/InfoPlist.strings

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/GLUT.nib/objects.nib

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/GLUTClipboard.nib/objects.nib

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/GLUTPreferences.nib/objects.nib

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/GLUTUI.strings

week03_01/bin/week03_01Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/InfoPlist.strings
	week03_01/bin/week03_01Debug.app/Contents/Info.plist
	week03_01/bin/week03_01Debug.app/Contents/MacOS/week03_01Debug
	week03_01/bin/week03_01Debug.app/Contents/PkgInfo
	week03_01/config.make
	week03_01/openFrameworks-Info.plist
	week03_01/src/main.cpp
	week03_01/src/testApp.cpp
	week03_01/src/testApp.h
	week03_01/week03_01.xcodeproj/project.pbxproj

week03_01/week03_01.xcodeproj/project.xcworkspace/contents.xcworkspaceda
ta

week03_01/week03_01.xcodeproj/project.xcworkspace/xcuserdata/aki.xcuserd
atad/UserInterfaceState.xcuserstate
	week03_01/week03_01.xcodeproj/xcshareddata/xcschemes/week03_01
Debug.xcscheme
	week03_01/week03_01.xcodeproj/xcshareddata/xcschemes/week03_01
Release.xcscheme

week03_01/week03_01.xcodeproj/xcuserdata/aki.xcuserdatad/xcschemes/xcsch
ememanagement.plist
	week03_01_2_/Makefile
	week03_01_2_/Project.xcconfig
	week03_01_2_/addons.make
	week03_01_2_/bin/data/.gitkeep

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Resources/English.lproj/GLUT.nib/objects.nib

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Resources/English.lproj/GLUTClipboard.nib/objects.nib

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Resources/English.lproj/GLUTPreferences.nib/objects.nib

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Resources/English.lproj/GLUTUI.strings

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Resources/English.lproj/InfoPlist.strings

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Versions/A/Resources/English.lproj/GLUT.nib/objects.nib

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Versions/A/Resources/English.lproj/GLUTClipboard.nib/objects.nib

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Versions/A/Resources/English.lproj/GLUTPreferences.nib/objects.nib

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Versions/A/Resources/English.lproj/GLUTUI.strings

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Versions/A/Resources/English.lproj/InfoPlist.strings

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Versions/Current/Resources/English.lproj/GLUT.nib/objects.nib

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Versions/Current/Resources/English.lproj/GLUTClipboard.nib/objects.nib

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Versions/Current/Resources/English.lproj/GLUTPreferences.nib/objects.n
ib

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Versions/Current/Resources/English.lproj/GLUTUI.strings

week03_01_2_/bin/week03_01_2_Debug.app/Contents/Frameworks/GLUT.framewor
k/Versions/Current/Resources/English.lproj/InfoPlist.strings
	week03_01_2_/bin/week03_01_2_Debug.app/Contents/Info.plist
	week03_01_2_/bin/week03_01_2_Debug.app/Contents/MacOS/week03_01_2_Debug
	week03_01_2_/bin/week03_01_2_Debug.app/Contents/PkgInfo
	week03_01_2_/config.make
	week03_01_2_/openFrameworks-Info.plist
	week03_01_2_/src/main.cpp
	week03_01_2_/src/testApp.cpp
	week03_01_2_/src/testApp.h
	week03_01_2_/week03_01_2_.xcodeproj/project.pbxproj

week03_01_2_/week03_01_2_.xcodeproj/project.xcworkspace/contents.xcworks
pacedata

week03_01_2_/week03_01_2_.xcodeproj/project.xcworkspace/xcuserdata/aki.x
cuserdatad/UserInterfaceState.xcuserstate

week03_01_2_/week03_01_2_.xcodeproj/xcshareddata/xcschemes/week03_01_2_
Debug.xcscheme

week03_01_2_/week03_01_2_.xcodeproj/xcshareddata/xcschemes/week03_01_2_
Release.xcscheme

week03_01_2_/week03_01_2_.xcodeproj/xcuserdata/aki.xcuserdatad/xcschemes
/xcschememanagement.plist
	week03_02_sound/Makefile
	week03_02_sound/Project.xcconfig
	week03_02_sound/addons.make
	week03_02_sound/bin/data/.gitkeep

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Resources/English.lproj/GLUT.nib/objects.nib

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Resources/English.lproj/GLUTClipboard.nib/objects.nib

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Resources/English.lproj/GLUTPreferences.nib/objects.nib

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Resources/English.lproj/GLUTUI.strings

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Resources/English.lproj/InfoPlist.strings

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Versions/A/Resources/English.lproj/GLUT.nib/objects.nib

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Versions/A/Resources/English.lproj/GLUTClipboard.nib/objects.nib

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Versions/A/Resources/English.lproj/GLUTPreferences.nib/objects.n
ib

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Versions/A/Resources/English.lproj/GLUTUI.strings

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Versions/A/Resources/English.lproj/InfoPlist.strings

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Versions/Current/Resources/English.lproj/GLUT.nib/objects.nib

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Versions/Current/Resources/English.lproj/GLUTClipboard.nib/objec
ts.nib

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Versions/Current/Resources/English.lproj/GLUTPreferences.nib/obj
ects.nib

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Versions/Current/Resources/English.lproj/GLUTUI.strings

week03_02_sound/bin/week03_02_soundDebug.app/Contents/Frameworks/GLUT.fr
amework/Versions/Current/Resources/English.lproj/InfoPlist.strings
	week03_02_sound/bin/week03_02_soundDebug.app/Contents/Info.plist

week03_02_sound/bin/week03_02_soundDebug.app/Contents/MacOS/libfmodex.dy
lib
	week03_02_sound/bin/week03_02_soundDebug.app/Contents/PkgInfo
	week03_02_sound/config.make
	week03_02_sound/openFrameworks-Info.plist
	week03_02_sound/src/main.cpp
	week03_02_sound/src/testApp.cpp
	week03_02_sound/src/testApp.h
	week03_02_sound/week03_02_sound.xcodeproj/project.pbxproj

week03_02_sound/week03_02_sound.xcodeproj/project.xcworkspace/contents.x
cworkspacedata

week03_02_sound/week03_02_sound.xcodeproj/project.xcworkspace/xcuserdata
/aki.xcuserdatad/UserInterfaceState.xcuserstate

week03_02_sound/week03_02_sound.xcodeproj/xcshareddata/xcschemes/week03_
02_sound Debug.xcscheme

week03_02_sound/week03_02_sound.xcodeproj/xcshareddata/xcschemes/week03_
02_sound Release.xcscheme

week03_02_sound/week03_02_sound.xcodeproj/xcuserdata/aki.xcuserdatad/xcs
chemes/xcschememanagement.plist
	week03_03/Makefile
	week03_03/Project.xcconfig
	week03_03/addons.make
	week03_03/bin/data/.gitkeep
	week03_03/bin/data/HibariPendulum.mp3

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/GLUT.nib/objects.nib

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/GLUTClipboard.nib/objects.nib

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/GLUTPreferences.nib/objects.nib

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/GLUTUI.strings

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/InfoPlist.strings

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/GLUT.nib/objects.nib

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/GLUTClipboard.nib/objects.nib

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/GLUTPreferences.nib/objects.nib

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/GLUTUI.strings

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/InfoPlist.strings

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/GLUT.nib/objects.nib

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/GLUTClipboard.nib/objects.nib

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/GLUTPreferences.nib/objects.nib

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/GLUTUI.strings

week03_03/bin/week03_03Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/InfoPlist.strings
	week03_03/bin/week03_03Debug.app/Contents/Info.plist
	week03_03/bin/week03_03Debug.app/Contents/MacOS/libfmodex.dylib
	week03_03/bin/week03_03Debug.app/Contents/PkgInfo
	week03_03/config.make
	week03_03/openFrameworks-Info.plist
	week03_03/src/main.cpp
	week03_03/src/testApp.cpp
	week03_03/src/testApp.h
	week03_03/url.txt
	week03_03/week03_03.xcodeproj/project.pbxproj

week03_03/week03_03.xcodeproj/project.xcworkspace/contents.xcworkspaceda
ta

week03_03/week03_03.xcodeproj/project.xcworkspace/xcuserdata/aki.xcuserd
atad/UserInterfaceState.xcuserstate
	week03_03/week03_03.xcodeproj/xcshareddata/xcschemes/week03_03
Debug.xcscheme
	week03_03/week03_03.xcodeproj/xcshareddata/xcschemes/week03_03
Release.xcscheme

week03_03/week03_03.xcodeproj/xcuserdata/aki.xcuserdatad/xcschemes/xcsch
ememanagement.plist
	week03_04/Makefile
	week03_04/Project.xcconfig
	week03_04/addons.make
	week03_04/bin/data/.gitkeep

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/GLUT.nib/objects.nib

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/GLUTClipboard.nib/objects.nib

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/GLUTPreferences.nib/objects.nib

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/GLUTUI.strings

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Reso
urces/English.lproj/InfoPlist.strings

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/GLUT.nib/objects.nib

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/GLUTClipboard.nib/objects.nib

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/GLUTPreferences.nib/objects.nib

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/GLUTUI.strings

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/A/Resources/English.lproj/InfoPlist.strings

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/GLUT.nib/objects.nib

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/GLUTClipboard.nib/objects.nib

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/GLUTPreferences.nib/objects.nib

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/GLUTUI.strings

week03_04/bin/week03_04Debug.app/Contents/Frameworks/GLUT.framework/Vers
ions/Current/Resources/English.lproj/InfoPlist.strings
	week03_04/bin/week03_04Debug.app/Contents/Info.plist
	week03_04/bin/week03_04Debug.app/Contents/MacOS/libfmodex.dylib
	week03_04/bin/week03_04Debug.app/Contents/PkgInfo
	week03_04/config.make
	week03_04/openFrameworks-Info.plist
	week03_04/src/main.cpp
	week03_04/src/testApp.cpp
	week03_04/src/testApp.h
	week03_04/week03_04.xcodeproj/project.pbxproj

week03_04/week03_04.xcodeproj/project.xcworkspace/contents.xcworkspaceda
ta

week03_04/week03_04.xcodeproj/project.xcworkspace/xcuserdata/aki.xcuserd
atad/UserInterfaceState.xcuserstate
	week03_04/week03_04.xcodeproj/xcshareddata/xcschemes/week03_04
Debug.xcscheme
	week03_04/week03_04.xcodeproj/xcshareddata/xcschemes/week03_04
Release.xcscheme

week03_04/week03_04.xcodeproj/xcuserdata/aki.xcuserdatad/xcschemes/xcsch
ememanagement.plist