Added new API key
new api
Added logo on bottom
.
Merge branch 'master' of https://github.com/tiy-durham-june2014-frontend/team-orange into mobile
new api
fixed merge conflicts
changes
Fixed merge conflicts...... once again
More merge conflicts
More merge conflicts