Few changes.
Merge branch 'master' of github.com:pwnedary/f2

Conflicts:
	.gitignore
	Makefile
	test/main.cpp