deleted code from comments
Merge branch 'v1' of https://github.com/eugene195/tp_2014_09_java into v1
deleted code from comments