Nick, Alpha RELEASE... the German
Merge branch 'master' of https://github.com/Academia2013Cohort4/Equipe1
Nick, Alpha RELEASE Update 1.