Merge pull request #2 from coldclimate/master

upstream merge
added myself
Merge branch 'master' of github.com:gotbadger/northeastjobnetwork

Conflicts:
	js/main.js
Merge pull request #8 from gotbadger/master

Added myself