local images
updated index
stuff
search
stuff
just updating the site
ignore
ignore
ignore
Merge branch 'master' into gh-pages
<rant> THIS SHOULD HAVE BEEN A FAST-FORWARD MERGE </rant>

Conflicts:
	aboutus.html
	categories.html
	categories2.html
	categories3.html
	categories4.html
	categories5.html
	contactus.html
	index.html
	search.html