Merge github.com:Severes1/Hopkins-Planner into events
Merge branch 'events' of github.com:jteplitz602/Hopkins-Planner into events

Conflicts:
	views/week.jade
mini calendar mostly working
merged and fixed your height issues

Conflicts:
	app.js
	views/week.jade
centered mini calendar
Merge branch 'master' into events

Conflicts:
	public/stylesheets/week.css
	views/week.jade
Merge branch 'bootstrap2.0' into events
something got broken...
gixed the issues with the modal, and made the calendar look a lot better
Merge branch 'master' of git://github.com/jteplitz602/Hopkins-Planner

Conflicts:
	app.js
	public/stylesheets/week.css
	views/week.jade
fixed merge issue
Merge branch 'bootstrap2.0' of git://github.com/jteplitz602/Hopkins-Planner

Conflicts:
	app.js
	node_modules/jade/.npmignore
	node_modules/jade/jade.js
	node_modules/jade/jade.min.js
	node_modules/jade/lib/compiler.js
	node_modules/jade/lib/filters.js
	node_modules/jade/lib/jade.js
	node_modules/jade/lib/nodes/block.js
	node_modules/jade/package.json
	public/stylesheets/week.css
	views/week.jade
weekpicker
NATE stop adding node_modules files to the repo
old changes
Merge branch 'master' of heroku.com:hopkins-planner

Conflicts:
	package.json
	public/stylesheets/week.css
	views/week.jade
fixed maroon and gray
hmm
added engines
cleaing up merge