Merge pull request #1 from csdl/master

This is just a test
Hello World Widget Documentation
Merge branch 'master' of https://github.com/csdl/makahiki
Merge branch 'master' of https://github.com/cammoore/makahiki