Testing commit

Added Headers and source file
Merge branch 'master' of https://github.com/temogen/CS340-CourseProject

Conflicts:
	CS340CP.pro