removed spaces between sliders
duplicate arrow fix
assets pipeline stuff
fixing merge conflict
Merge branch 'master' of github.com:dyep49/alex into new_zoo