added a line
Merge remote-tracking branch 'upstream/master'
added 2012 docs because 2013 docs are not yet complete
point to the 2012 PDFs
Merge pull request #1 from FRC3322/master

FRC-specific material