MVCed everything
Merge branch 'master' of https://github.com/luiscard91/2014FallWeb

Conflicts:
	fitnessapp/Controllers/test.php