commit test
Merge branch 'master' of https://github.com/Joshuabaker2/EECE381Group10

Conflicts:
	Software/module_1/module_1.c
resolved conflicts