[master]

- Necessary lib
[master 11:36 9/9/2013]

- Merged remote repository
Merge remote-tracking branch 'origin/master'

Conflicts:
	fluidsim-master/Fluid
	fluidsim-master/Fluid.glsl
	fluidsim-master/Fluid3d.cpp
	fluidsim-master/Light.glsl
	fluidsim-master/Raycast.glsl
	fluidsim-master/Utility.cpp
	fluidsim-master/Utility.h
	fluidsim-master/bstrlib.c
	fluidsim-master/bstrlib.h
	fluidsim-master/vmath.hpp
[master 11:49 9/9/2013]

- Fixed merging conflicts
[develop 15:44 9/9/2013]

- Trying to convert source code
[develop 15:53 9/9/2013]

- Modified some files
Merge branch 'develop'
[develop]

- Analysis
[develop 22:46 2013/9/9]

- Added some fluid sim projects
[develop]

- CFD
[develop]

- Found a fatal error
[develop]

- Fixed some bugs
[develop]

- 代碼當中仍存在著邏輯錯誤，可能需要重新架構
[develop]

- 重新架構工程
[develop]

- 重構進行中
[develop]

- 按照計劃正常顯示二維貼圖
[develop]

- 重構完成，並且測試後無邏輯錯誤
- 接下來可以開始cfd的設計工作
Merge branch 'develop'
[develop]

- Fixed little problem
[develop]

- advect函數
- 未測試