first carlos
carlos fix merge conflicts
Merge branch 'master' of https://github.com/vincentngo/VTHacks
working notifs
fix notif merge conflict