changing ignore files
static files
adding git ignore file
merging
changing content
content merging
content updates
stuff
removing stuff
removing
removing stuff
removing
stuff
Merge branch 'master' into development