fixes
Merge remote-tracking branch 'spa/master'
set default to 6 goals
cleanup
remove social.rb
Merge remote-tracking branch 'jeko/master'
refactoring