pre-comit before UI setup
Merge branch 'master' of https://github.com/arsalion/Joyride
Merge branch 'master' of https://github.com/arsalion/Joyride
Auto merge conflicts
Create '/static/' files reference functionality from settings.py, and move static assets to appropriate static folder.