Fix for Issue # 5 'Some minor problems with displaying things on the site as well as with html syntax of pages.'
Update lock file
Fixing merge for adding_grunt branch