Merge pull request #8 from fergusean/master

Added password support
Merge pull request #9 from fergusean/master

MicroBlog
Merge pull request #10 from fergusean/master

Categories
Merge pull request #11 from fergusean/master

Blah blog blah
Derp.
Access Blog at /blog
Another Derp
Merge pull request #12 from fergusean/master

added category to imports for posts list
Merge branch 'master' of https://github.com/mikeytusa/MicroSite into mikeytusa-master

Conflicts:
	.htaccess
Merge branch 'refs/heads/mikeytusa-master'