I did aa thign
Merge branch 'master' of https://github.com/andrade824/FearTracker

Conflicts:
	another.c