Added test file feature.html
Added test file feature.html
Merge branch 'new_feature' of https://github.com/xmarcosx/portal into new_feature
Merge branch 'master' into new_feature