made everything lighter and simpler
Merge branch 'master' of github.com:lingz/odeh-web-programming