I wrote this in 30 min before I went to bed @four04
Merge branch 'master' into json

Conflicts:
	.gitignore
	src/file.c
	src/file.h
	src/main.c
move the jsons out of the project root