Method 1 basic tests
Merge branch 'master' of https://github.com/GrosSacASac/Java2014HTW_CL