fixed incorrect link
Merge remote-tracking branch 'upstream/dev'
updating FAQ language and some stray text updates
fixed hackday sendto links
fucking up shit from Erikas merge
doing some housecleaning
updating from the Erika merge
fixing weird duplicate files in the site folder
oh my god how did those files end up there
Merge pull request #79 from sinker/devWed

Dev wed