merging
resolving merge conflicts
Adding ARIA and changing to get clean HTML5 validation. Updating Javascript to improve readability
Adding ARIA roles and validating HTML. Readability changes to Javascript