Made updates to add endpoint
Merge branch 'master' of https://github.com/briananderson1222/FloRida

Conflicts:
	UI/app/scripts/controllers/FloController.js