Merge branches 'master' and 'master' of github.com:chefmax/Music_Site
add cookies, save in field and controllers return views
New Models