This is the first commit

Signed-off-by: EvanTam <evantam@hotmail.com>
Merge branch 'master' of github.com:EvanTam/featureBased