updates to the master, but in this new branch

made updates to the master branch (the one which was submitted for
iter1), but saved the changes to this branch instead of the master
branch.
search bar functionality, updated Collaborations

added search bar functionality and updated the Collaborations model
added downbeat functionality, added History model
Revert "added downbeat functionality, added History model"

This reverts commit 95d09752102d1eb1d6404d57d6cfba2fc8f2fb05.
updated tracks folder
readded downbeat, b/c git messed up
fixed downbeat to sort by date in reverse
basic embedded mp3 player (Dev environ, IE10 only)

basic embedded mp3 player has been added to the website. Currently only
for Dev environment and only for IE10+. Hopefully this will all port
over smoothly once we move to production environment.
fix for undefined window.location.origin in IE
updated embedded mp3 player

added more functionality to the embedded mp3 player
collaborations can now be played!

added functionality to allow playing of collaborations (a.k.a.
"layering" of tracks).
updated collab UI to be more informative
updated and added functionality to userpage

updated userpage to be more seamless. also added new features to
interact with collaborations, such as adding and deleting tracks within
a collaboration.
lots of code cleanup
added small new features and updates

- added cancel button to userprofile page
- added displayName field to userprofile
- showing displayName instead of firstName+lastName
- added page refresh on change to collaboration
- added expiration to session
added TODO to top of views.py
fixed bug with register redirecting to signin

fixed bug where registering would redirect user to sign-in instead of
userpage. now correctly redirects to userpage.
cleaning up code
started to add comments for models and views
format fixing