Updated how encode and decode return data
Merge branch 'master' of https://github.com/joshcurtis/CPE400_PA2