chris

chris
Merge branch 'master' of https://github.com/trestcreative/forma-fitness

Conflicts:
	admin/core/php-error.log
	admin/includes/mysql_connection.php
	includes/mysql_connection.php