add techdays and 1st comite:x
Merge branch 'master' of https://github.com/franmosteiro/elComite

Conflicts:
	index.html
	views/grids_css.html