added files from school project
testing how classes are working together in include file
Merge x2 class branches in 1