Updated classes
Merge branch 'master' of http://github.com/ALShum/ALShum.github.io