changed main
Merge https://github.com/bonhomat/2013-ETP2