Made testing class and changed main
Merge branch 'master' of https://github.com/westernsystems/f13DLAProject.git