Resolve conflicts
IT FINALLY FUCKING WORKSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS
Add setting
Add scrolling comments
Fix scrolling comments
Merge pull request #46 from kelvinblade/master

merge