Nodebots Day Announcements
Merge branch 'master' of https://github.com/bmf/general-info

Merge needed because I did this in the wrong order. Again.