Merge branch 're-design' of https://github.com/enoklabs/av-dashboard into re-design
Merge branch 're-design'
.gitignore is now working
Merge branch 're-design'
Merge branch 'master' of https://github.com/enoklabs/av-dashboard