functional test
Merge branch 'MM_ftest' of https://github.com/eugene195/tp_2014_09_java into MM_ftest
Merge branch 'master' of https://github.com/eugene195/tp_2014_09_java into MM_ftest
ResourceTest was added