moar commits
Merge branch 'master' of https://github.com/germangb/gl_template