1.First commit.
Merge branch 'master' of https://github.com/swallowzhang/A-openGL-demo

Conflicts:
	README.md