Moved functions around
AJAX added skeleton for swapping songs. not tested
giMerge remote-tracking branch 'origin/master'