start using sass
cleanup
removed vendors
fixed json
attempting to separate controllers/services/etc.
still sep
separation of controllers
testing git via webstorm
Merge branch 'master' into develop