messed up email sending
test change to readme
pulling from upstream
resolving conflicts from pull - search merge
ajax changes
working intro email
most of styling is done, comments and navbar search are fixed
fixed player on index page
working like button
some ranking changes
working sort algo
algo changes
fixed clip create bug, but playlist add still not working
js dropdown updated, background image
Merge pull request #13 from kaifius/test_branch

test change to readme
long/lat
Merge branch 'master' of https://github.com/kaifius/wdi-group-project
likes and playlist conflicts resolved
schema merged
merge location changes