Added updated Encoder and HBridge files to this year's (2014) folder
Resolved master conflicts.