committing before creating new feature branch
Added new affixed slider timeline
attempt to fix conflicts in feature merge with master