added bin/ and gedit backup
Merge branch 'master' of https://github.com/AlmasB/axiom
Merge branch 'opengl' of https://github.com/AlmasB/axiom into opengl
deleted .cpp~