clean up
add new files
Merge branch 'master' of github.com:pennappslabs/Events
sticky filters