Merge pull request #74 from ChristianMurphy/develop

fixing js styling