Imported changes to rice coding
Merge branch 'master' of https://github.com/jbhickey/asp_project

Conflicts:
	asp_project.c
	encoder.c