Merge branch 'working' of git://github.com/thecodeisclear/metro-bootstrap

Conflicts:
	components.html
	css/metro-bootstrap.css
Merge #42