Modified .gitignore.
add createArticleTempate
Merged changes. Solved conflicts in createArticleTemplate.html