Switched to 3 column layout
Added table to resourceDisplay
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/index.js
Changed headers