Everything works now. Fixed API and fronted.
Merge branch 'master' of https://github.com/yourbuddyconner/JungleWood-Web-App

Conflicts:
	app/app.js
	app/controllers.js
	index.php
	views/dashboard.html
	views/home.html
	views/login.html
	views/signup.html