First commit
:w I need to do this merge for a college project.

Merge branch 'master' of https://github.com/jjdahdah/SocialBandJ

i I need to do this merge for a college project