Reverted to allman style
Merge branch 'master' of github.com:Gazok/Tank