first commit
Initial commit
Merge branch 'master' of github.com:olegon/project002
update Fev/20
Merge branch 'master' of github.com:olegon/glfw_normal_mapping

Conflicts:
	README.md
Old version.