Start of Drink and Song model objects. Network Controller setup.
fix conflicts
fix conflicts
Merge branch 'master' into parkerbranch
Create remote branch
Merge pull request #2 from jeffChavez/parkerbranch

Parkerbranch