changes in text
Merge branch 'master' of github.com:andgarzon/jobsity2012

Conflicts:
	scripts/jobsity.js