Nothing really
Merge branch 'master' of https://github.com/lawsonk1215/QlfHfgaQot

Conflicts:
	app/controllers/BrowseJobsController.php
	app/controllers/JobsController.php
	app/views/jobs/browse/index.blade.php
	app/views/jobs/completed/index.blade.php
	app/views/jobs/create.blade.php
	app/views/jobs/current/index.blade.php
	app/views/jobs/edit.blade.php
	app/views/jobs/index.blade.php
	app/views/jobs/show.blade.php
	app/views/layouts/default.blade.php
	app/views/users/edit.blade.php