first commit
Initial files and project set-up
Setting up Github
Setting up Github some more
Issues with merge
Merge branch 'master' of https://github.com/Gunzalez/GroupKit