added comment
merging
added about.js
Merge pull request #25 from shawnlknight/master

added about.js
conflicts fixed