Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.DS_Store
	css/bootstrap-theme.css
	css/bootstrap-theme.min.css
	css/bootstrap.css
	css/bootstrap.min.css
	css/carousel.css
	css/main.css
	fonts/glyphicons-halflings-regular.eot
	fonts/glyphicons-halflings-regular.svg
	fonts/glyphicons-halflings-regular.ttf
	fonts/glyphicons-halflings-regular.woff
	index.html
	js/bootstrap.js
	js/bootstrap.min.js
	js/holder.js
Layout Update