Merge branch 'master' of https://github.com/nckswt/FARSHAPE into chuck-testing

Conflicts:
	a.out
Merge branch 'nick-testing' into chuck-testing
dsaf
Accidentally swapped bytes 5/6, corrected now
Merge branch 'nick-testing', remote-tracking branch 'origin' into chuck-testing

Conflicts:
	tests/encoder_test.c
started oop implimentation
Merge branch 'nick-testing' of https://github.com/nckswt/FARSHAPE into chuck-testing
Refactored to objected-oriented code
Deleting unused code
Implemented Encoder as OOP and renamed the file
Started code for location system, added Makefile
Fixed up makefile
Edited makefile
I dunno, changes that made things work.
Commit message goes here
whatever
whatever again.
renamed .c to .cpp for Nick's happiness
Changes to makefile
commit