Merge branch 'feature-assets'
Removing assets directory, renaming to images, moving to separate branch