updated main.c and prototypes.h to make code easier to read
Merge branch 'master' of https://github.com/jvanderploeg/347_proj