Update README.md
Reverted to the wrong change
Merge branch 'master' of github.com:badassmofo/xtrip
Reverted to the wrong change
Updated README
Removed some prototypes for old functions
Merge branch 'master' into develop

Conflicts:
	README.md
	main.c
	main.h
	makefile