Trying to get rid of mine so I can pull
still fixing git problems
I didn't chagne anything
Added testing records
Merge branch 'master' of https://github.com/Hekar428/3380-Project