Non-void functions now expect return statements
Merge branch 'master' of github.com:danielfinke/cpsc425