Committing to pull Julio's changes
Merge branch 'master' of github.com:juliogarcia93/Jukebox
pushing my stuff from today
committing everything
Pushing my changes