...
Merge branch 'master' of https://github.com/imarkdesigns/html5strap.2.3

Conflicts:
	assets/fonts/opensans/OpenSans-Bold-webfont.eot
	assets/fonts/opensans/OpenSans-CondBold-webfont.eot
	assets/fonts/opensans/OpenSans-CondLight-webfont.eot
	assets/fonts/opensans/OpenSans-Light-webfont.eot
	assets/fonts/opensans/OpenSans-Regular-webfont.eot
	assets/fonts/opensans/OpenSans-Semibold-webfont.eot