Columns
Merge branch 'master' of github.com:richard-lopes/edart

Conflicts:
	client/index.html
Merge branch 'master' of github.com:richard-lopes/edart