Added a whole bunch of pages
Minor Changes
More style changes
Merge branch 'master' into gh-pages

Conflicts:
	.DS_Store