ctesniere/Code-Guide — pull request #8 by ctesniere (2014-02-09 12:30:22+00:00)
Title: Merge pull request #7 from ctesniere/master

Merge