Closed ftorning closed 6 years ago
updated main.js and already merged master changes since branching, so there aren't too many changes
updated main.js and already merged master changes since branching, so there aren't too many changes