Day 3 Hot-Fix

Conflicts:
	.jshintrc
	tests/helpers.js