added function prototypes
Merge branch 'master' of https://github.com/keenanjohnson/cpe4160

Because Keenan pushed while I was working, duh