My message
Merge branch 'master' into fix_expand
Remove jquery; reformat code
Merge pull request #3 from apurvis/fix_expand

merging in the JS and CSS files