Fixing New Relic crash
Prevent newrelic from crashing server, lint-compatible equality, comments
Whoops! Converting to 2-space to adhere to project conventions
Merge branch 'responsive'
Resolving conflicts and removing extra newrelic require

Conflicts:
	server.js
Merge branch 'master' of https://github.com/codefellows/oaa