Commit after first session of pair programming.
Merge branch 'master' of github.com:seanastephens/335-JukeBoxOne