Merge branch 'master' of http://github.org/sils1297/learning