MERGING
Merge branch 'database' of github.com:DSin52/CollabTunes into database
UPDATE: fixing some changes