added grunt and sassquatch
Merge branch 'master' of https://github.com/thealscott/portfolio

Conflicts:
	Gruntfile.js
	node_modules/grunt-sassquatch/Gruntfile.js
	node_modules/grunt-sassquatch/README.md
	node_modules/grunt-sassquatch/package.json
	node_modules/grunt-sassquatch/tasks/lib/sassquatch.js
	node_modules/grunt/node_modules/.bin/cake
	node_modules/grunt/node_modules/.bin/coffee
	node_modules/grunt/node_modules/.bin/js-yaml
	node_modules/grunt/node_modules/.bin/nopt
	node_modules/grunt/node_modules/.bin/which
	node_modules/grunt/node_modules/async/package.json
	node_modules/grunt/node_modules/coffee-script/bin/cake
	node_modules/grunt/node_modules/coffee-script/bin/coffee
	node_modules/grunt/node_modules/coffee-script/lib/coffee-script/parser.js
	node_modules/grunt/node_modules/coffee-script/package.json
	node_modules/grunt/node_modules/colors/package.json
	node_modules/grunt/node_modules/dateformat/package.json
	node_modules/grunt/node_modules/eventemitter2/package.json
	node_modules/grunt/node_modules/findup-sync/node_modules/lodash/README.md
	node_modules/grunt/node_modules/findup-sync/node_modules/lodash/package.json
	node_modules/grunt/node_modules/hooker/package.json
	node_modules/grunt/node_modules/iconv-lite/package.json
	node_modules/grunt/node_modules/js-yaml/bin/js-yaml.js
	node_modules/grunt/node_modules/js-yaml/node_modules/.bin/esparse
	node_modules/grunt/node_modules/js-yaml/node_modules/.bin/esvalidate
	node_modules/grunt/node_modules/js-yaml/node_modules/argparse/examples/arguments.js
	node_modules/grunt/node_modules/js-yaml/node_modules/argparse/examples/choice.js
	node_modules/grunt/node_modules/js-yaml/node_modules/argparse/examples/constants.js
	node_modules/grunt/node_modules/js-yaml/node_modules/argparse/examples/help.js
	node_modules/grunt/node_modules/js-yaml/node_modules/argparse/examples/nargs.js
	node_modules/grunt/node_modules/js-yaml/node_modules/argparse/examples/parents.js
	node_modules/grunt/node_modules/js-yaml/node_modules/argparse/examples/prefix_chars.js
	node_modules/grunt/node_modules/js-yaml/node_modules/argparse/examples/sub_commands.js
	node_modules/grunt/node_modules/js-yaml/node_modules/argparse/examples/sum.js
	node_modules/grunt/node_modules/js-yaml/node_modules/argparse/node_modules/underscore.string/package.json
	node_modules/grunt/node_modules/js-yaml/node_modules/argparse/node_modules/underscore/package.json
	node_modules/grunt/node_modules/js-yaml/node_modules/argparse/package.json
	node_modules/grunt/node_modules/js-yaml/node_modules/esprima/bin/esparse.js
	node_modules/grunt/node_modules/js-yaml/node_modules/esprima/bin/esvalidate.js
	node_modules/grunt/node_modules/js-yaml/node_modules/esprima/package.json
	node_modules/grunt/node_modules/js-yaml/package.json
	node_modules/grunt/node_modules/lodash/README.md
	node_modules/grunt/node_modules/lodash/package.json
	node_modules/grunt/node_modules/nopt/bin/nopt.js
	node_modules/grunt/node_modules/nopt/examples/my-program.js
	node_modules/grunt/node_modules/rimraf/node_modules/graceful-fs/package.json
	node_modules/grunt/node_modules/rimraf/package.json
	node_modules/grunt/node_modules/underscore.string/package.json
	node_modules/grunt/node_modules/which/bin/which
	node_modules/grunt/node_modules/which/package.json
	node_modules/grunt/package.json
	node_modules/grunt/test/fixtures/exec.cmd
	node_modules/grunt/test/fixtures/exec.sh
	package.json