gitignore
updated gitignore
gumby.css added to gitignore
carousel.html renamed
3 col 3 blocks form

added new html, added sass
added 3col 1block form

added 3col 1block form, CSS optimised
blocks with custom tags

Stages, Forms, Text block, there's a to-do list also
fixes

960/940 block fixing, forms with modifications to fit Marton' specification
Merge remote-tracking branch 'origin/Mr_Blue_Arnau'

Conflicts:
	.gitignore
arrows menu first block

ACHTUNG! Not finished!
Merge branch 'origin/Mr_Green_jordisan'

Conflicts:
	css/gumby.css
	sass/_custom.scss
Revert "arrows menu first block"

This reverts commit 819316efc98a3e125c53fbf60155e8a712dee853.
Merge branch 'master'

Conflicts:
	sass/_custom.scss