adding gitignore
solving problems with gitignore
Merge branch 'master' of github.com:victorgonal/HultFramework

* 'master' of github.com:victorgonal/HultFramework:
  fixes
  blocks with custom tags
  added 3col 1block form
  3 col 3 blocks form
  carousel.html renamed
  updated gitignore
  gitignore
Merge branch 'master' of github.com:victorgonal/HultFramework

* 'master' of github.com:victorgonal/HultFramework:
  arrows menu first block
Restyling layout for Image-Text stage and adding Fitvid to adapt the videos
Creating the programs stage1
Mend layout of the programs stage1
Adding a video to the stage1
Merge branch 'prototypes' into Mr_Red_Ripoll

* prototypes: (25 commits)
  Adding a video to the stage1
  Mend layout of the programs stage1
  Creating the programs stage1
  removing from cache gumby.css, removing useless class in stage and create a new folder for program page
  fixing a bug in home page stage
  Remove from tracking with Git
  Typography: vertical rhythm spacing (text paddings)
  Minor changes in 2thirds-1third block
  Button links in 2thirds/1third teasers
  adding the footer
  onethird and twothirds teasers (with background)
  Setting the buttons as designs
  Creating generic content blocks (initially for home) Issue with left-margin on sematic grids
  Creating a stage block for homepage prototype v2
  adding colors variables in settings
  Creating a stage block for homepage prototype
  Trying to adapt typography to Photoshop designs More work on header.html
  New folder
  Folder structure for prototypes Starting with header.html ...
  Make carousel JavaScript non-id dependant Start using semantic tags (section)
  ...

Conflicts:
	.gitignore
	sass/_custom.scss
	sass/gumby.scss
Creating the new stage2, adding breadcrumbs and adding a froogaloop to manage the video API
Merge branch '2014_html_prototypes' of github.com:victorgonal/HultFramework into prototypes

* '2014_html_prototypes' of github.com:victorgonal/HultFramework:
  home
  starting with home

Conflicts:
	sass/_custom.scss