first commit
Merge branch 'master' of https://github.com/Janyell/tp_2014_02_java_sycheva