Working on column widths.
Merge branch 'master' into Adrienne

Conflicts:
	views/index.ejs