2012 backup
Merge pull request #2 from benedfit/2012

2012 backup