Michael: COmmit, goal test works
Merge branch 'master' of https://github.com/Taelsin/Team-Wu-Tang-Clan

Conflicts:
	MichaelsStuff/func.c
	MichaelsStuff/main.c