ok
edits
mvc
Merge branch 'startingMVC' of https://github.com/kikocastro/2014FallWeb

Conflicts:
	fitness_track_app/onepageapp/index.html
diet control mvc - not complete
diet control working
fixes