Desktop Table Design
Merge branch 'master' of https://github.com/corotchi/financialTables

Conflicts:
	public/javascripts/main.js