initial set up
initial set up
Merge branch 'master' of https://github.com/mgurnett/FFSoc