Cleaned up unnecessary routes
added error messages
updating error messages
updating from upstream master
Outlining party spec tests
pulling from upstream
pulling origin master
User spec tests passing
Song spec tests passing
Party spec tests passing
spec's pending in party
revising comment spec for new association
added simplecov testing coverage
deleting wrong file names
controller specs, saving progress, not complete
Merging from upstream, conflict resolved in model song
resolving merge conflicts from origin master
spec controllers nearing completion, looking to see refactoring
merging upstream master, cleaned up models
resolving party model validation