This is another commit
Merged mine and beatrix's code together
Merge branch 'master' of https://github.com/andrade824/FearTracker

Conflicts:
	another.c