Revert ".."

This reverts commit 0abb13416fe09e173e63f486bb3f5023fe85c323.
Merge branch 'master' of github.com:Jon0/opengl-project
add avatar
add guy