resolved conflicts
fix further conflicts
fixed typo
Merge pull request #52 from jamesjenkinsyates/master

Some JS changes