Pulling from Lucy!
Merge remote-tracking branch 'origin/master'
Started work on searched events view. Still hardcoded for now but used string formatting so we can fill with firebase
Merge remote-tracking branch 'origin/master'