Merge pull request #2 from Robbqin/experimental

branches test
Merge pull request #3 from Robbqin/experimental

branch test 2
css

updated the css a little bit. doesn´t change anything
spaced out the html

spaced out the html a but to enhance readability
Merge pull request #4 from Robbqin/experimental

Experimental
Work done on school

done on school
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css
	index.html
fixed merge problems

fixed the site, working on it without github kinda fucked it up. just a
little though, all good now
Footer

Fixed the footer.
Merge pull request #6 from Robbqin/master

Sync master branch with experimental