second commit
Merge branch 'master' of https://github.com/abartolo/is217-final-apple

Conflicts:
	app.js
	node_modules/express/.travis.yml
	node_modules/express/History.md
	node_modules/express/LICENSE
	node_modules/express/Makefile
	node_modules/express/Readme.md
	node_modules/express/bin/express
	node_modules/express/lib/application.js
	node_modules/express/lib/express.js
	node_modules/express/lib/middleware.js
	node_modules/express/lib/request.js
	node_modules/express/lib/response.js
	node_modules/express/lib/router/index.js
	node_modules/express/lib/router/route.js
	node_modules/express/lib/utils.js
	node_modules/express/lib/view.js
	node_modules/express/node_modules/buffer-crc32/README.md
	node_modules/express/node_modules/buffer-crc32/index.js
	node_modules/express/node_modules/buffer-crc32/package.json
	node_modules/express/node_modules/buffer-crc32/tests/crc.test.js
	node_modules/express/node_modules/commander/History.md
	node_modules/express/node_modules/commander/Readme.md
	node_modules/express/node_modules/commander/index.js
	node_modules/express/node_modules/commander/package.json
	node_modules/express/node_modules/connect/.travis.yml
	node_modules/express/node_modules/connect/Readme.md
	node_modules/express/node_modules/connect/lib/connect.js
	node_modules/express/node_modules/connect/lib/index.js
	node_modules/express/node_modules/connect/lib/middleware/basicAuth.js
	node_modules/express/node_modules/connect/lib/middleware/bodyParser.js
	node_modules/express/node_modules/connect/lib/middleware/compress.js
	node_modules/express/node_modules/connect/lib/middleware/cookieParser.js
	node_modules/express/node_modules/connect/lib/middleware/cookieSession.js
	node_modules/express/node_modules/connect/lib/middleware/csrf.js
	node_modules/express/node_modules/connect/lib/middleware/directory.js
	node_modules/express/node_modules/connect/lib/middleware/errorHandler.js
	node_modules/express/node_modules/connect/lib/middleware/favicon.js
	node_modules/express/node_modules/connect/lib/middleware/json.js
	node_modules/express/node_modules/connect/lib/middleware/limit.js
	node_modules/express/node_modules/connect/lib/middleware/logger.js
	node_modules/express/node_modules/connect/lib/middleware/methodOverride.js
	node_modules/express/node_modules/connect/lib/middleware/multipart.js
	node_modules/express/node_modules/connect/lib/middleware/query.js
	node_modules/express/node_modules/connect/lib/middleware/session.js
	node_modules/express/node_modules/connect/lib/middleware/session/cookie.js
	node_modules/express/node_modules/connect/lib/middleware/static.js
	node_modules/express/node_modules/connect/lib/middleware/staticCache.js
	node_modules/express/node_modules/connect/lib/middleware/timeout.js
	node_modules/express/node_modules/connect/lib/middleware/urlencoded.js
	node_modules/express/node_modules/connect/lib/middleware/vhost.js
	node_modules/express/node_modules/connect/lib/patch.js
	node_modules/express/node_modules/connect/lib/proto.js
	node_modules/express/node_modules/connect/lib/public/directory.html
	node_modules/express/node_modules/connect/lib/public/style.css
	node_modules/express/node_modules/connect/lib/utils.js
	node_modules/express/node_modules/connect/node_modules/bytes/History.md
	node_modules/express/node_modules/connect/node_modules/bytes/component.json
	node_modules/express/node_modules/connect/node_modules/bytes/index.js
	node_modules/express/node_modules/connect/node_modules/bytes/package.json
	node_modules/express/node_modules/connect/node_modules/pause/package.json
	node_modules/express/node_modules/connect/node_modules/qs/.npmignore
	node_modules/express/node_modules/connect/node_modules/qs/index.js
	node_modules/express/node_modules/connect/node_modules/qs/package.json
	node_modules/express/node_modules/connect/package.json
	node_modules/express/node_modules/cookie-signature/History.md
	node_modules/express/node_modules/cookie-signature/index.js
	node_modules/express/node_modules/cookie-signature/package.json
	node_modules/express/node_modules/cookie/.travis.yml
	node_modules/express/node_modules/cookie/index.js
	node_modules/express/node_modules/cookie/package.json
	node_modules/express/node_modules/cookie/test/parse.js
	node_modules/express/node_modules/cookie/test/serialize.js
	node_modules/express/node_modules/debug/Readme.md
	node_modules/express/node_modules/debug/lib/debug.js
	node_modules/express/node_modules/debug/package.json
	node_modules/express/node_modules/fresh/Readme.md
	node_modules/express/node_modules/fresh/index.js
	node_modules/express/node_modules/fresh/package.json
	node_modules/express/node_modules/methods/index.js
	node_modules/express/node_modules/methods/package.json
	node_modules/express/node_modules/mkdirp/.travis.yml
	node_modules/express/node_modules/mkdirp/index.js
	node_modules/express/node_modules/mkdirp/package.json
	node_modules/express/node_modules/send/History.md
	node_modules/express/node_modules/send/Readme.md
	node_modules/express/node_modules/send/lib/send.js
	node_modules/express/node_modules/send/node_modules/mime/README.md
	node_modules/express/node_modules/send/node_modules/mime/mime.js
	node_modules/express/node_modules/send/node_modules/mime/package.json
	node_modules/express/node_modules/send/node_modules/mime/test.js
	node_modules/express/node_modules/send/node_modules/mime/types/mime.types
	node_modules/express/node_modules/send/node_modules/mime/types/node.types
	node_modules/express/node_modules/send/package.json
	node_modules/express/package.json
	node_modules/jade/LICENSE
	node_modules/jade/README.md
	node_modules/jade/component.json
	node_modules/jade/jade.js
	node_modules/jade/lib/compiler.js
	node_modules/jade/lib/jade.js
	node_modules/jade/lib/lexer.js
	node_modules/jade/lib/parser.js
	node_modules/jade/node_modules/character-parser/package.json
	node_modules/jade/node_modules/commander/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/README.md
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/bin/uglifyjs
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/lib/compress.js
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/lib/scope.js
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/lib/sourcemap.js
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/node_modules/uglify-to-browserify/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/package.json
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/test/compress/conditionals.js
	node_modules/jade/node_modules/constantinople/node_modules/uglify-js/tools/node.js
	node_modules/jade/node_modules/constantinople/package.json
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/README.md
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/minimatch.js
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/package.json
	node_modules/jade/node_modules/monocle/node_modules/readdirp/node_modules/minimatch/test/defaults.js
	node_modules/jade/node_modules/monocle/node_modules/readdirp/package.json
	node_modules/jade/node_modules/transformers/node_modules/css/node_modules/css-stringify/package.json
	node_modules/jade/node_modules/transformers/node_modules/css/package.json
	node_modules/jade/node_modules/transformers/node_modules/promise/node_modules/is-promise/package.json
	node_modules/jade/node_modules/transformers/node_modules/promise/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/jade/node_modules/transformers/node_modules/uglify-js/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/README.md
	node_modules/jade/node_modules/with/node_modules/uglify-js/bin/uglifyjs
	node_modules/jade/node_modules/with/node_modules/uglify-js/lib/compress.js
	node_modules/jade/node_modules/with/node_modules/uglify-js/lib/scope.js
	node_modules/jade/node_modules/with/node_modules/uglify-js/lib/sourcemap.js
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/optimist/node_modules/wordwrap/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/optimist/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/source-map/node_modules/amdefine/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/source-map/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/node_modules/uglify-to-browserify/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/package.json
	node_modules/jade/node_modules/with/node_modules/uglify-js/test/compress/conditionals.js
	node_modules/jade/node_modules/with/node_modules/uglify-js/tools/node.js
	node_modules/jade/node_modules/with/package.json
	node_modules/jade/package.json
	node_modules/jade/runtime.js
	node_modules/stylus/Readme.md
	node_modules/stylus/bin/stylus
	node_modules/stylus/lib/colors.js
	node_modules/stylus/lib/convert/css.js
	node_modules/stylus/lib/functions/index.js
	node_modules/stylus/lib/functions/index.styl
	node_modules/stylus/lib/lexer.js
	node_modules/stylus/lib/middleware.js
	node_modules/stylus/lib/nodes/arguments.js
	node_modules/stylus/lib/nodes/atblock.js
	node_modules/stylus/lib/nodes/binop.js
	node_modules/stylus/lib/nodes/block.js
	node_modules/stylus/lib/nodes/boolean.js
	node_modules/stylus/lib/nodes/call.js
	node_modules/stylus/lib/nodes/charset.js
	node_modules/stylus/lib/nodes/comment.js
	node_modules/stylus/lib/nodes/each.js
	node_modules/stylus/lib/nodes/expression.js
	node_modules/stylus/lib/nodes/extend.js
	node_modules/stylus/lib/nodes/function.js
	node_modules/stylus/lib/nodes/group.js
	node_modules/stylus/lib/nodes/hsla.js
	node_modules/stylus/lib/nodes/ident.js
	node_modules/stylus/lib/nodes/if.js
	node_modules/stylus/lib/nodes/import.js
	node_modules/stylus/lib/nodes/index.js
	node_modules/stylus/lib/nodes/keyframes.js
	node_modules/stylus/lib/nodes/literal.js
	node_modules/stylus/lib/nodes/media.js
	node_modules/stylus/lib/nodes/member.js
	node_modules/stylus/lib/nodes/node.js
	node_modules/stylus/lib/nodes/null.js
	node_modules/stylus/lib/nodes/object.js
	node_modules/stylus/lib/nodes/params.js
	node_modules/stylus/lib/nodes/property.js
	node_modules/stylus/lib/nodes/return.js
	node_modules/stylus/lib/nodes/rgba.js
	node_modules/stylus/lib/nodes/root.js
	node_modules/stylus/lib/nodes/selector.js
	node_modules/stylus/lib/nodes/string.js
	node_modules/stylus/lib/nodes/ternary.js
	node_modules/stylus/lib/nodes/unaryop.js
	node_modules/stylus/lib/nodes/unit.js
	node_modules/stylus/lib/parser.js
	node_modules/stylus/lib/renderer.js
	node_modules/stylus/lib/utils.js
	node_modules/stylus/lib/visitor/compiler.js
	node_modules/stylus/lib/visitor/evaluator.js
	node_modules/stylus/lib/visitor/normalizer.js
	node_modules/stylus/node_modules/css-parse/package.json
	node_modules/stylus/node_modules/debug/Readme.md
	node_modules/stylus/node_modules/debug/lib/debug.js
	node_modules/stylus/node_modules/debug/package.json
	node_modules/stylus/node_modules/glob/package.json
	node_modules/stylus/node_modules/sax/package.json
	node_modules/stylus/package.json
	package.json
	public/stylesheets/style.css
	views/index.jade
	views/layout.jade
fixing repo
Merge branch 'master' of https://github.com/abartolo/is217-final-apple