app and song model updates
user form merge confilct resolved
Merge branch 'master' of github.com:dshamis317/valence
refactoring models
merge conflict resolution
routes merged
Merge branch 'master' of github.com:dshamis317/valence