Added some sick beats, yo.

AND NOT DS_STORE
merge conflict fix
finished