commit
Merge branch 'master' of github.com:mdere/general_assembly