Merge pull request #2 from paulhyunkim/dinnabranch

validations added
Added has_secure_password to model
fix merge conflicts
added meta-spotify gem
Added Foundation, jQuery changes, Styling Changes, Grid
moved player
moved player
resolved gem conflict
Merge pull request #4 from paulhyunkim/aaronbranch

Added Foundation, jQuery changes, Styling Changes, Grid
sending track info through controller
fading navbar