Working on FileController.

Working on FileController.
Merge branch 'master' of https://github.com/estebanpadilla/prj_Fast-Delicious

Conflicts:
	nbproject/private/private.properties
Save changes

Save changes