initial commit
merged code
Merge branch 'source' of https://github.com/greven/greven.github.com into source