big stuff
merge
Merge branch 'bootstrap'

* bootstrap:
  big stuff

Conflicts:
	css/main.css
	index.html
new layout
Merge pull request #4 from FilWisher/newLayout

New layout