Updated return values
Merge branch 'master' of https://github.com/cjkirk09/BYUGetMeThere