Opprettet initiell mappestruktur
Noen engelske originaler
Retta noen småfeil.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile

Merging with upstream
Done merging...