Merge branch 'web-feature'
Added gitignore
Merge branch 'config'
Beginning the 'true html fetch' feature, changed Tests