hi
hi
hey
hey
trying to integrate sequelize
sucessfully adds sequelize
fixing merge conflicts
map
hi
fixing insane merge conflicts
still fixing merge conflicts
fixing syntax errors
adding instructions to app.js for database
Delete map link from map page
Merge branch 'master' of github.com:sufrin-kim-fishman/node_express_sample_app
about to restart my computer
Merge branch 'master' of github.com:sufrin-kim-fishman/node_express_sample_app
Fix routes and ports and stuff
Fix merge conflicts