stuff on live
Merge branch 'master' of https://github.com/crosscliq/displaytrac
everything