Merge branch 'master' of https://github.com/SerkanSipahi/classy

Conflicts:
	dev/README.md
Merge branch 'master' of https://github.com/SerkanSipahi/classy

Conflicts:
	dev/README.md