Merge pull request #1 from tiy-durham-june2014-frontend/layout/style

Structured HTML and added style to CSS
integrating API
Getting up to date
fixed merge conflict