added project name and member
Switched around a bit, added a class in css so we can float thing to half the width of the parent, renamed the nav items
Removed the orange theme
Messing around a bit, added an imagetag
Added the footer text
Stole two images from ikeas frontpage to see how the scaling of images worked
Added a title, changed the header on the page aswell
Messed a bit more with the header and how it should look on large screens, it's starting to look decent
Fixed the linking of the css
Test
Merge branch 'master' into gh-pages

Conflicts:
	README.md
	index.html

Signed-off-by: Christfoffer Holmgren <christoffer.holmgren@gmail.com>
Added the removed changes. Thankfully, Sublime text had the files cached.

It was a failure on my part.