Revert "To Nathan, lots of love from Ryan."

This reverts commit 5e4308b86d3cf6d7cfc5fbad95ba6461b2a482dd.
Merge branch 'master' of https://github.com/chris-paterson/study-buddy

Conflicts:
	Gruntfile.js
	node_modules/grunt/node_modules/grunt-legacy-log/node_modules/underscore.string/package.json
	package.json