Initial commit from local git
Merge branch 'master' of github.com:diegotremper/codefest2014

Initial merge to sync local git with remote git