Fixed a small bug in queryStringGenerator.js
Added controllers for the angular
Merge branch 'master' of https://github.com/Derpessor96/EndToEndTeamEris

Conflicts:
	public/js/app.js
	public/js/controllers/homeCtrl.js
	public/js/services/queryStringGenerator.js
	public/views/offers/new-offers.jade
	server/controllers/usersController.js