Merge pull request #1 from Prekrim/master

Nästan helt fungerande program, txt filer inkluderade.
Merge pull request #1 from ViktorStahl/master

Merge pull request #1 from Prekrim/master