Revert "Modified the application layout to remove Company rep page when logged i..."
Merge pull request #5 from sschlinsog/master

Check out my code for Review
Merge pull request #3 from mbeck7/revert-2-login_debugging

Revert "Modified the application layout to remove Company rep page when ...
Removes old files from merge conflicts.
This will prevent a customer rep from creating a new post until approved
Removing the solr setup from the README file
Just added the approved:true to the customer_rep page
Adds job, company, company rep, and admin fixtures.
Adds tests for the job and company models.
Adds methods in the job and company models that perform common tasks.
Merges changes from master into working copy.
Merge branch 'feature/methods_for_common_tasks'
Adds a new field to the database in the jobs migration file so the user can search for local or remote jobs
Adds a new field to the seeds file to populate the database when doing a rake on the database so the user can search for a local, remote or both for a job.
Adds a updated gem to the gem file when doing a bundle update when getting a clean copy of the project.