Modified gitignore file.
Committing a file to the master branch
Added test file feature.html
Merge branch 'new_feature' of https://github.com/xmarcosx/portal into new_feature