merging major conflicts
Merge branch 'master' of https://github.com/Akollek/BreakSync
:wq