Adding updated server and song model

Still need to include songs_routes
Fixing merge conflicts
fix conflicts
Merge pull request #4 from joekteo/simondev

Adding updated server and song model