modified:   .gitignore
	modified:   Makefile
Merge branch 'ringlog' of github.com:0x42/fire into ringlog

Conflicts:
	Makefile
format log ringlog
	modified:   .gitignore
	modified:   Makefile
	modified:   src/log/logging.c
	modified:   src/log/logging.h
	modified:   src/main.c
	modified:   test/logtest.c
	modified:   test/maintest.c
stress test
	modified:   .gitignore
	modified:   Makefile
	modified:   src/log/logging.c
	modified:   src/log/logging.h
	new file:   src/log/robolog.c
	new file:   src/log/robolog.h
	modified:   test/logtest.c
	modified:   test/maintest.c
	new file:   test/robologtest.c
	new file:   test/stress/Makefile
	new file:   test/stress/stress.c
	new file:   test/stress/stress.gdb