comment
Merge branch 'master' of https://github.com/ichiefboz/ifantasyfitness

Conflicts:
	home/index.php
Resolved sync conflict