huu

jijij
Text

Text
Revert "Text"

This reverts commit 77a29c5248a5a092527eb007722d872147fec3fa.
Merge branch 'master' of https://github.com/eiriko2303/Gruppeprosjekt-webprosjekt-Anders-Patrick-Jon-og-Eirik

Conflicts:
	Ikoner/computer10.png
	Ikoner/computer11.png
	Ikoner/computer12.png
	Ikoner/computer13.png
	Ikoner/computer14.png
	Ikoner/computer15.png
	Ikoner/computer16.png
	Ikoner/computer17.png
	Ikoner/computer18.png
	Ikoner/computer19.png
	Ikoner/computer2.png
	Ikoner/computer20.png
	Ikoner/computer21.png
	Ikoner/computer22.png
	Ikoner/computer23.png
	Ikoner/computer24.png
	Ikoner/computer25.png
	Ikoner/computer26.png
	Ikoner/computer27.png
	Ikoner/computer28.png
	Ikoner/computer29.png
	Ikoner/computer3.png
	Ikoner/computer4.png
	Ikoner/computer5.png
	Ikoner/computer6.png
	Ikoner/computer7.png
	Ikoner/computer8.png
	Ikoner/computer9.png
	header.css
	index.html
	timeline.css