dsaf
Merge branch 'nick-testing', remote-tracking branch 'origin' into chuck-testing

Conflicts:
	tests/encoder_test.c
started oop implimentation