merging to get
Merge branch 'master' of github.com:ThorArakis/bc_hack_swans