changes
Merge branch 'master' of github.com:agulek91/memmaker