first commit
Merge https://github.com/nmoraes/DevFest2013