deploying to heroku
fixing package.json refs
fixing package.json refs
fixing server.js
Merge branch 'master' of github.com:hadzz/CSI120Midterm
adding files
adding files
adding files
adding files
adding files
Merge branch 'master' of github.com:hadzz/CSI120Midterm

Conflicts:
	index.html
	node_modules/.bin/express
	node_modules/.bin/express.cmd
	node_modules/Sentimental/package.json
	node_modules/cloneextend/README.md
	node_modules/cloneextend/index.js
	node_modules/cloneextend/package.json
	node_modules/connect/lib/middleware/errorHandler.js
	node_modules/connect/lib/middleware/json.js
	node_modules/connect/lib/middleware/urlencoded.js
	node_modules/connect/node_modules/buffer-crc32/package.json
	node_modules/connect/node_modules/bytes/package.json
	node_modules/connect/node_modules/cookie-signature/package.json
	node_modules/connect/node_modules/cookie/package.json
	node_modules/connect/node_modules/debug/package.json
	node_modules/connect/node_modules/fresh/package.json
	node_modules/connect/node_modules/methods/index.js
	node_modules/connect/node_modules/methods/package.json
	node_modules/connect/node_modules/multiparty/node_modules/readable-stream/node_modules/core-util-is/package.json
	node_modules/connect/node_modules/multiparty/node_modules/readable-stream/node_modules/debuglog/package.json
	node_modules/connect/node_modules/multiparty/node_modules/readable-stream/package.json
	node_modules/connect/node_modules/multiparty/node_modules/stream-counter/package.json
	node_modules/connect/node_modules/multiparty/package.json
	node_modules/connect/node_modules/multiparty/test/fixture/http/encoding/beta-sticker-1.png.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/encoding/binaryfile.tar.gz.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/encoding/blank.gif.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/encoding/menu_seperator.png.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/encoding/plain.txt.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/no-filename/filename-name.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/no-filename/generic.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/preamble/crlf.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/preamble/preamble.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/osx-chrome-13.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/osx-firefox-3.6.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/osx-safari-5.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/xp-chrome-12.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/xp-ie-7.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/xp-ie-8.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/xp-safari-5.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/workarounds/missing-hyphens1.http
	node_modules/connect/node_modules/multiparty/test/fixture/http/workarounds/missing-hyphens2.http
	node_modules/connect/node_modules/negotiator/package.json
	node_modules/connect/node_modules/pause/package.json
	node_modules/connect/node_modules/qs/package.json
	node_modules/connect/node_modules/raw-body/.npmignore
	node_modules/connect/node_modules/raw-body/.travis.yml
	node_modules/connect/node_modules/raw-body/Makefile
	node_modules/connect/node_modules/raw-body/README.md
	node_modules/connect/node_modules/raw-body/index.js
	node_modules/connect/node_modules/raw-body/package.json
	node_modules/connect/node_modules/send/node_modules/mime/package.json
	node_modules/connect/node_modules/send/node_modules/range-parser/package.json
	node_modules/connect/node_modules/send/package.json
	node_modules/connect/node_modules/uid2/package.json
	node_modules/connect/package.json
	node_modules/express/.travis.yml
	node_modules/express/History.md
	node_modules/express/Readme.md
	node_modules/express/lib/response.js
	node_modules/express/lib/router/index.js
	node_modules/express/node_modules/buffer-crc32/package.json
	node_modules/express/node_modules/commander/node_modules/keypress/package.json
	node_modules/express/node_modules/commander/package.json
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/encoding/beta-sticker-1.png.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/encoding/binaryfile.tar.gz.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/encoding/blank.gif.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/encoding/menu_seperator.png.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/encoding/plain.txt.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/no-filename/filename-name.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/no-filename/generic.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/preamble/crlf.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/preamble/preamble.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/osx-chrome-13.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/osx-firefox-3.6.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/osx-safari-5.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/xp-chrome-12.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/xp-ie-7.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/xp-ie-8.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/special-chars-in-filename/xp-safari-5.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/workarounds/missing-hyphens1.http
	node_modules/express/node_modules/connect/node_modules/multiparty/test/fixture/http/workarounds/missing-hyphens2.http
	node_modules/express/node_modules/cookie-signature/package.json
	node_modules/express/node_modules/cookie/package.json
	node_modules/express/node_modules/debug/package.json
	node_modules/express/node_modules/fresh/package.json
	node_modules/express/node_modules/methods/package.json
	node_modules/express/node_modules/mkdirp/package.json
	node_modules/express/node_modules/range-parser/package.json
	node_modules/express/node_modules/send/node_modules/mime/package.json
	node_modules/express/node_modules/send/package.json
	node_modules/express/package.json
	node_modules/jqtpl/node_modules/underscore/package.json
	node_modules/jqtpl/package.json
	node_modules/twit/node_modules/oauth/package.json
	node_modules/twit/package.json
	node_modules/weathers/index.js
	node_modules/weathers/node_modules/request/package.json
	node_modules/weathers/package.json
	package.json
	page2.css
	page2_1.html
	page2_2.html
	style.css
add