Updated 404 page. Should solve #68.
Update 404.html
minor fixes; added rfid post.
Merge branch 'master' of https://github.com/jamiereid/makehackvoid.com
made rfid image smaller
Merge pull request #77 from jamiereid/master

Updated 404 page. Fixes #68. Added RFID blog post
Fix 404 location
Delete 2013-10-08-incorporated.md

Removed 'Incorporated' page. Not MHV relevant.
Delete incorporated.jpg

Removed 'Incorporated' jpg. Not MHV relevant.
Merge pull request #79 from B0073D/master

Delete 2013-10-08-incorporated.md - closes #52
Fixed #78

Attempted to update the post layout to accept the way we were defining
authors in the .md files, however it ended up being easier to modify the
way we were defining rather than change the layout.  All in all, I don't
think it will be a big issue to define them the way it is now.

We'll need to make sure we add an author to the _data/members.yml file for
each author that posts.  I've added an MHV author for generic posts such
as the quadcopter workshop, and infrastucture day posts.
Fixed #78

Attempted to update the post layout to accept the way we were defining
authors in the .md files, however it ended up being easier to modify the
way we were defining rather than change the layout.  All in all, I don't
think it will be a big issue to define them the way it is now.

We'll need to make sure we add an author to the _data/members.yml file for
each author that posts.  I've added an MHV author for generic posts such
as the quadcopter workshop, and infrastucture day posts.
Merge branch 'fix-missing-author' of https://github.com/jamiereid/makehackvoid.com into fix-missing-author

Conflicts:
	_data/members.yml
fixed merge problem with _data/members.yml
updated _data/members.yml
added 'link' attributes for all members
Merge pull request #80 from jamiereid/fix-missing-author

Fixed #78. Thanks @jamiereid!