Merge pull request #6 from elizabethm2014/master

Updated profile page
updated testing
Revert a22df91..ebb5301

This rolls back to commit a22df911481d8635ca4fad39601394e330b7aae7.
Revert "Made a javascript function that can render a card from a json object"

This reverts commit a22df911481d8635ca4fad39601394e330b7aae7.

Conflicts:
	search.html
	testJobs.json
Revert "Merge pull request #6 from elizabethm2014/master"

This reverts commit a22df911481d8635ca4fad39601394e330b7aae7.

Conflicts:
	search.html
	testJobs.json
fixed some conflict stuff
Now the stuff's committed
updated after merge