Merge pull request #1 from nickmalleson/gh-pages

minor change to test pushing changes
Merge pull request #3 from nickmalleson/gh-pages

Updated website
made uni logo smaller so navigation menu fits
Delete .index.html.swp
added master layout and markdown files for main website pages, with updated html links - structure draft done
Merge branch 'gh-pages' of github.com:Robinlovelace/gisruk2015 into gh-pages

Conflicts:
	.index.html.swp