more function headers added
more function headers added
Merge branch 'master' of https://github.com/Shawg/eeceProject2