first commit
Merge branch 'master' of github.com:cevaris/opengl

Conflicts:
	.gitignore
Merge branch 'master' of github.com:cevaris/opengl

Conflicts:
	.gitignore