add Demo classes
update rythmWebsite configuration
resolve conflict
Merge pull request #24 from greenlaw110/master

Add some demo classes