working comments without refresh
committing jquery comments
fixing merge conflicts