added classes and function declarations
Merge branch 'master' of https://github.com/kryzodoze/340-project