working index and main landing page
proper index
Merge branch 'gh-pages' of https://github.com/joshuatj/buku555-design into gh-pages

Conflicts:
	css/bootstrap-theme.css
	css/bootstrap-theme.css.map
	css/bootstrap-theme.min.css
	css/bootstrap.css
	css/bootstrap.css.map
	css/bootstrap.min.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