Fixed asked by Marton
Merge branch '2014_html_prototypes' of github.com:victorgonal/HultFramework into 2014_html_prototypes

Conflicts:
	sass/_custom.scss