Merge pull request #5 from darrenburns/feature-ui

Basic UI - initial layout
DOM elements IDs changed
Fixed padding button group
Merge ssh://github.com/darrenburns/TeamProject3 into feature-ui
Fixed conflict
Merge remote branch 'origin/feature-ui' into feature-ui